[Bug 1728] In ntp_openssl.m4, don't add -I/usr/include or -L/usr/lib to CPPFLAGS...

bk: 4ce20e3cwbrcT7jvZQW2No-SUGBXXg

diff --git a/ChangeLog b/ChangeLog
index dc96cbdd4d1e7af854ad6eb265ab565c1c865322..da96905dcd7a00dc8bd39284eca1aab3404a8f40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 ---
+
+* [Bug 1728] In ntp_openssl.m4, don't add -I/usr/include or -L/usr/lib
+  to CPPFLAGS or LDFLAGS.
+
+---
 (4.2.6p3-RC10) 2010/11/14 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Bug 1681] More sntp logging cleanup.

diff --git a/m4/ntp_openssl.m4 b/m4/ntp_openssl.m4
index 79acd3814b379d014c06ffd0c2a62e06d7f4d006..e1df56088df7824fc89257d8c903c641aecb648e 100644 (file)
--- a/m4/ntp_openssl.m4
+++ b/m4/ntp_openssl.m4
@@ -107,10 +107,18 @@ AC_MSG_RESULT([$ans])
 case "$ntp_openssl" in
  yes)
     # We have OpenSSL inc/lib - use them.
-    CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
-    LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
-    case "$need_dash_r" in
-     1) LDFLAGS="$LDFLAGS -R$OPENSSL_LIB"
+    case "$OPENSSL_INC" in
+     /usr/include) ;;
+     *)        CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
+       ;;
+    esac
+    case "$OPENSSL_LIB" in
+     /usr/lib) ;;
+     *)        LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
+       case "$need_dash_r" in
+        1) LDFLAGS="$LDFLAGS -R$OPENSSL_LIB" ;;
+       esac
+       ;;
     esac
     AC_SUBST(LCRYPTO, [-lcrypto])
     AC_DEFINE(OPENSSL, , [Use OpenSSL?])