From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 10 Jan 2017 11:05:44 +0000 (-0500)
Subject: openssl configure cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c12016802f0e7884bf14b5a18a0bc2b2d816a71c;p=thirdparty%2Fntp.git

openssl configure cleanup

bk: 5874c008tFhFPuzLMfDkFBzQMH-HKw
---

diff --git a/sntp/m4/ntp_libntp.m4 b/sntp/m4/ntp_libntp.m4
index 1263423ed..3f35a92da 100644
--- a/sntp/m4/ntp_libntp.m4
+++ b/sntp/m4/ntp_libntp.m4
@@ -661,9 +661,6 @@ esac
 
 
 AC_CHECK_HEADERS([priv.h])
-
-AC_MSG_CHECKING([if we have solaris privileges])
-
 case "$ac_cv_header_priv_h" in
  yes)
     case "$host" in 
@@ -686,6 +683,7 @@ AC_ARG_ENABLE(
     [ntp_have_solarisprivs=$enableval]
 )
 
+AC_MSG_CHECKING([if we have solaris privileges])
 
 case "$ntp_have_solarisprivs" in
  yes)
diff --git a/sntp/m4/ntp_openssl.m4 b/sntp/m4/ntp_openssl.m4
index 0e38aba73..39302495b 100644
--- a/sntp/m4/ntp_openssl.m4
+++ b/sntp/m4/ntp_openssl.m4
@@ -57,13 +57,20 @@ AC_ARG_WITH(
 	[s Disable auto-added -R linker paths]
     )]
 )
+
 ntp_openssl=no
 ntp_openssl_from_pkg_config=no
+
 with_crypto=${with_crypto:-openssl,libcrypto}
 case "$with_crypto" in
  yes)
     with_crypto=openssl,libcrypto
 esac
+
+DNL AC_MSG_NOTICE(['%with_crypto:%{PKG_CONFIG:+notempty}:%{with_openssl_libdir-notgiven}:%{with_openssl_incdir-notgiven}'])
+DNL str="$with_crypto:${PKG_CONFIG:+notempty}:${with_openssl_libdir-notgiven}:${with_openssl_incdir-notgiven}"
+DNL AC_MSG_NOTICE([$str])
+
 case "$with_crypto:${PKG_CONFIG:+notempty}:${with_openssl_libdir-notgiven}:${with_openssl_incdir-notgiven}" in
  no:*) ;;
  *:notempty:notgiven:notgiven)
@@ -73,7 +80,7 @@ case "$with_crypto:${PKG_CONFIG:+notempty}:${with_openssl_libdir-notgiven}:${wit
 	    CPPFLAGS_NTP="$CPPFLAGS_NTP `$PKG_CONFIG --cflags-only-I $pkg`"
 	    CFLAGS_NTP="$CFLAGS_NTP `$PKG_CONFIG --cflags-only-other $pkg`"
 	    LDADD_NTP="$LDADD_NTP `$PKG_CONFIG --libs-only-L $pkg`"
-	    LDADD_NTP="$LDADD_NTP `$PKG_CONFIG --libs-only-l $pkg`"
+	    LDADD_NTP="$LDADD_NTP `$PKG_CONFIG --libs-only-l --static $pkg`"
 	    LDFLAGS_NTP="$LDFLAGS_NTP `$PKG_CONFIG --libs-only-other $pkg`"
 	    VER_SUFFIX=o
 	    ntp_openssl=yes
@@ -85,6 +92,11 @@ case "$with_crypto:${PKG_CONFIG:+notempty}:${with_openssl_libdir-notgiven}:${wit
 	AC_MSG_RESULT([no])
     done
 esac
+DNL AC_MSG_NOTICE([OpenSSL Phase I checks:])
+DNL AC_MSG_NOTICE([CPPFLAGS_NTP: $CPPFLAGS_NTP])
+DNL AC_MSG_NOTICE([CFLAGS_NTP: $CFLAGS_NTP])
+DNL AC_MSG_NOTICE([LDADD_NTP: $LDADD_NTP])
+DNL AC_MSG_NOTICE([LDFLAGS_NTP: $LDFLAGS_NTP])
 case "$with_crypto:$ntp_openssl" in
  no:*) ;;
  *:no)
@@ -370,6 +382,12 @@ case "$ntp_openssl" in
     ;;
 esac
 
+DNL AC_MSG_NOTICE([OpenSSL final checks:])
+DNL AC_MSG_NOTICE([CPPFLAGS_NTP: $CPPFLAGS_NTP])
+DNL AC_MSG_NOTICE([CFLAGS_NTP: $CFLAGS_NTP])
+DNL AC_MSG_NOTICE([LDADD_NTP: $LDADD_NTP])
+DNL AC_MSG_NOTICE([LDFLAGS_NTP: $LDFLAGS_NTP])
+
 CPPFLAGS="$NTPO_SAVED_CPPFLAGS"
 LIBS="$NTPO_SAVED_LIBS"
 AS_UNSET([NTPO_SAVED_CFLAGS])