Makefile.ac bug fix

prbinu · Sep 24, 2023 · 03d3c16 · 03d3c16
1 parent 6570c3c
commit 03d3c16
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -6,18 +6,17 @@ TS_BUILD_DATE = $(shell date '+%Y-%m-%d')
 TS_OS = $(shell uname -s)
 TS_ARCH = $(shell uname -p)
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I build-root/include -I build-root/include -Wall -Wundef -Wshadow -Wunreachable-code -Wswitch-default -Wcast-align -pedantic -g -std=c99 -D_GNU_SOURCE -DTS_VERSION=\"$(TS_VERSION)\" -DTS_BUILD_DATE=\"$(TS_BUILD_DATE)\" -DTS_OS=\"$(TS_OS)\"
+AM_CPPFLAGS = -I$(top_srcdir)/include -I build-root/include -I build-root/include -Wall -Wundef -Wshadow -Wunreachable-code -Wswitch-default -Wcast-align -pedantic -g -std=c99 -D_GNU_SOURCE -DTS_VERSION=\"$(TS_VERSION)\" -DTS_BUILD_DATE=\"$(TS_BUILD_DATE)\" -DTS_OS=\"$(TS_OS)\" -DTS_ARCH=\"$(TS_ARCH)\"
 
-if LINUX
-
-ifeq ($(TS_ARCH),x86_64)
+if LINUX_AMD64
 LDADD =  build-root/lib/libssl.a build-root/lib/libcrypto.a build-root/lib/libevent.a build-root/lib/libevent_openssl.a build-root/lib/libgnutls.a build-root/lib64/libhogweed.a build-root/lib64/libnettle.a build-root/lib/libz.a -ldl -lrt
-else
-LDADD =  build-root/lib/libssl.a build-root/lib/libcrypto.a build-root/lib/libevent.a build-root/lib/libevent_openssl.a build-root/lib/libgnutls.a build-root/lib/libhogweed.a build-root/lib/libnettle.a build-root/lib/libz.a -ldl -lrt
 endif
+
+if LINUX_ARM64
+LDADD =  build-root/lib/libssl.a build-root/lib/libcrypto.a build-root/lib/libevent.a build-root/lib/libevent_openssl.a build-root/lib/libgnutls.a build-root/lib/libhogweed.a build-root/lib/libnettle.a build-root/lib/libz.a -ldl -lrt
 endif
 
-if DARWIN
+if DARWIN_AMD64
 LDADD =  build-root/lib/libssl.a build-root/lib/libcrypto.a build-root/lib/libevent.a build-root/lib/libevent_openssl.a build-root/lib/libgnutls.a build-root/lib/libhogweed.a build-root/lib/libnettle.a -ldl
 AM_LDFLAGS = -lz -framework Security -framework CoreFoundation
 endif

diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,9 @@
-AC_INIT([tls-scan], [1.4.1], [])
+AC_INIT([tls-scan], m4_esyscmd([grep -m 1  Version CHANGELOG | awk '{print $2}' | tr -d '\n']), [])
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 AC_PROG_CC
 AC_CONFIG_FILES([Makefile])
+
 AC_CANONICAL_HOST
 case "$host_os" in
         darwin*)
@@ -13,7 +14,20 @@ case "$host_os" in
         ;;
 esac
 
-AM_CONDITIONAL([LINUX], [test x$linux = xtrue])
-AM_CONDITIONAL([DARWIN], [test x$darwin = xtrue])
+case "$host_cpu" in
+        aarch64)
+            arm64=true
+        ;;
+        x86_64)
+            amd64=true
+        ;;
+        arm)
+            arm64=true
+        ;;
+esac
+
+AM_CONDITIONAL([LINUX_ARM64], [test x$linux$arm64 = xtruetrue])
+AM_CONDITIONAL([LINUX_AMD64], [test x$linux$amd64 = xtruetrue])
+AM_CONDITIONAL([DARWIN_AMD64], [test x$darwin = xtrue])
 AC_OUTPUT
 
diff --git a/main.c b/main.c
@@ -1651,7 +1651,7 @@ int main(int argc, char **argv)
       strcpy(op.ciphers, old_ciphers);
       break;
     case 'v':
-      printf("tls-scan %s %s %s\n", TS_VERSION, TS_OS, TS_BUILD_DATE);
+      printf("tls-scan %s %s %s %s\n", TS_VERSION, TS_OS, TS_ARCH, TS_BUILD_DATE);
       printf("Built with OpenSSL-%lx GnuTLS-%x\n",
                                OPENSSL_VERSION_NUMBER, GNUTLS_VERSION_NUMBER);
       exit(EXIT_SUCCESS);