From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 16 Nov 2010 04:53:16 +0000 (-0500)
Subject: [Bug 1728] In ntp_openssl.m4, don't add -I/usr/include or -L/usr/lib to CPPFLAGS... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85fa6cbb1c8db3db93220b05ec669f9bbe67f612;p=thirdparty%2Fntp.git

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

bk: 4ce20e3cwbrcT7jvZQW2No-SUGBXXg
---

diff --git a/ChangeLog b/ChangeLog
index dc96cbdd4d..da96905dcd 100644
--- 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 79acd3814b..e1df56088d 100644
--- 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?])