LCRYPTO is gone - replace with VER_SUFFIX

bk: 4f87ebbfPG_sRufDwJi7VD5MvIuRMg

diff --git a/ChangeLog b/ChangeLog
index d6c880ad178a2e216c7b3bc54c9f8b841d79179b..df1653b4cc389086049ba266a0b20cb9713866e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* LCRYPTO is gone - replace with VER_SUFFIX.
 (4.2.7p271) 2012/04/11 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1122] openssl detection via pkg-config fails when no additional
   -Idir flags are needed.

diff --git a/scripts/mkver.in b/scripts/mkver.in
index f3ea05c9bd11abd25e048f025ab884fa7539ea26..3aef1c816a7f30a48112a5c46cb9fb40b24988f3 100644 (file)
--- a/scripts/mkver.in
+++ b/scripts/mkver.in
@@ -10,11 +10,9 @@ case "$CSET" in
  *) ConfStr="$ConfStr@$CSET" ;;
 esac
 
-case "@LCRYPTO@" in
+case "@VER_SUFFIX@" in
  '') ;;
- -lcrypto)
-    ConfStr="${ConfStr}-o" ;;
- *) ConfStr="${ConfStr}-?" ;;
+ *) ConfStr="${ConfStr}-@VER_SUFFIX@" ;;
 esac
 
 ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`"

diff --git a/sntp/m4/ntp_openssl.m4 b/sntp/m4/ntp_openssl.m4
index 4396a6769feda5b2ea3ee2c8f98e4adc64c405fe..c88fc0433f17371e290013adbffa45698649f86b 100644 (file)
--- a/sntp/m4/ntp_openssl.m4
+++ b/sntp/m4/ntp_openssl.m4
@@ -27,6 +27,7 @@ dnl
 dnl ####################################################################
 AC_DEFUN([NTP_OPENSSL], [
 AC_REQUIRE([NTP_PKG_CONFIG])dnl
+AC_REQUIRE([NTP_VER_SUFFIX])dnl
 
 AC_ARG_WITH(
     [crypto],
@@ -71,6 +72,7 @@ case "$with_crypto:${PKG_CONFIG:+notempty}:${with_openssl_libdir-notgiven}:${wit
        LDADD_NTP="$LDADD_NTP `$PKG_CONFIG --libs-only-L openssl`"
        LDADD_NTP="$LDADD_NTP `$PKG_CONFIG --libs-only-l openssl`"
        LDFLAGS_NTP="$LDFLAGS_NTP `$PKG_CONFIG --libs-only-other openssl`"
+       VER_SUFFIX=o
        ntp_openssl=yes
        ntp_openssl_from_pkg_config=yes
     fi
@@ -172,6 +174,7 @@ case "$with_crypto:$ntp_openssl" in
        ntp_openssl=no
     else
        ntp_openssl=yes
+       VER_SUFFIX=o
     fi
     case "$ntp_openssl" in
      yes)
@@ -204,6 +207,11 @@ AC_MSG_RESULT([$ntp_openssl])
 case "$ntp_openssl" in
  yes)
     AC_DEFINE([OPENSSL], [], [Use OpenSSL?])
+    case "$VER_SUFFIX" in
+     *o*) ;;
+     *) AC_MSG_ERROR([OPENSSL set but no 'o' in VER_SUFFIX!]) ;;
+    esac
+    ;;
 esac
 
 NTPO_SAVED_CPPFLAGS="$CPPFLAGS"

diff --git a/sntp/m4/ntp_ver_suffix.m4 b/sntp/m4/ntp_ver_suffix.m4
new file mode 100644 (file)
index 0000000..34839b5
--- /dev/null
+++ b/sntp/m4/ntp_ver_suffix.m4
@@ -0,0 +1,13 @@
+dnl ####################################################################
+dnl NTP Version Suffix (Crypto)
+dnl
+dnl Output substitutions:
+dnl    VER_SUFFIX      Version Suffix (scripts/mkver.in)
+dnl
+dnl ####################################################################
+AC_DEFUN([NTP_VER_SUFFIX], [
+
+AC_SUBST([VER_SUFFIX])
+VER_SUFFIX=
+])
+dnl ======================================================================