From 736db44524864225b719eda2262cd4b2a940304b Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 17 Jul 2003 15:19:56 +0000
Subject: Yet another round of fixes.

svn path=/trunk/; revision=3819
---
 configure.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 6b86ebd0..197a0410 100644
--- a/configure.in
+++ b/configure.in
@@ -601,7 +601,7 @@ then
   then
     ###	ssl.h found under openssl.  Use openssl configuration preferentially
     echo "Enabling OpenSSL support in $with_ssl"
-    CEFLAGS="$CEFLAGS -I$with_ssl/include -I$with_ssl/include/openssl"
+    CEFLAGS="$CEFLAGS -I$with_ssl/include/openssl"
     ###	OpenBSD comes with ssl headers
   elif test -r /usr/include/ssl/ssl.h
   then
@@ -609,7 +609,7 @@ then
     CEFLAGS="$CEFLAGS -I/usr/include/ssl"
   else
     echo "Enabling SSLeay support in $with_ssl"
-    CEFLAGS="$CEFLAGS -I$with_ssl/include"
+    test "$with_ssl" != "/usr" && CEFLAGS="$CEFLAGS -I$with_ssl/include"
   fi
   LDEFLAGS="$LDEFLAGS -L$with_ssl/lib"
   LIBS="$LIBS -lssl -lcrypto"
@@ -668,7 +668,8 @@ x)
     do
       if test -f "$dir/include/hesiod.h"
       then
-        test "$dir" != "/usr" && CEFLAGS="$CEFLAGS -DHESIOD -I$dir/include"
+        CEFLAGS="$CEFLAGS -DHESIOD"
+        test "$dir" != "/usr" && CEFLAGS="$CEFLAGS -I$dir/include"
         LDEFLAGS="$LDEFLAGS -L$dir/lib"
         LIBS="$LIBS -lhesiod"
         with_hesiod=$dir
@@ -678,7 +679,8 @@ x)
     ;;
 *)
     # Path given
-    CEFLAGS="$CEFLAGS -DHESIOD -I$with_hesiod/include"
+    CEFLAGS="$CEFLAGS -DHESIOD"
+    test "$with_hesiod" != "/usr" && CEFLAGS="$CEFLAGS -I$with_hesiod/include"
     LDEFLAGS="$LDEFLAGS -L$with_hesiod/lib"
     LIBS="$LIBS -lhesiod"
     ;;
-- 
cgit v1.2.3