source: trunk/dports/sysutils/cfengine/files/patch-configure @ 5196

Last change on this file since 5196 was 5196, checked in by rshaw, 17 years ago

Updated to release 2.1.1.
Corrected db4 dependency to actually look for the db-4 version library.

Submitted by: rshaw
Approved by: rshaw

  • Property svn:eol-style set to native
File size: 2.4 KB
Line 
1--- configure.orig      Wed Feb  4 13:06:11 2004
2+++ configure   Wed Feb  4 13:39:40 2004
3@@ -8192,13 +8192,13 @@
4 else
5     if test "x$BERKELEY_DB_DIR" = "xyes" ; then
6         for v in BerkeleyDB.3.2 BerkeleyDB.3.3 BerkeleyDB.4.0  BerkeleyDB.4.1  BerkeleyDB.4.2; do
7-            for d in /opt /usr/local /usr; do
8+            for d in $prefix /opt /usr/local /usr; do
9                 test -d "$d/$v" && BERKELEY_DB_DIR="$d/$v"
10             done
11         done
12     fi
13     if test "x$BERKELEY_DB_DIR" = "xyes" ; then
14-        for d in /opt /usr/local /usr; do
15+        for d in $prefix /opt /usr/local /usr; do
16             for v in db-4 db4 db3 db; do
17                 if test -f "$d/include/$v/db.h" ; then
18                     test "x$d" != "x/usr" && BERKELEY_DB_LDFLAGS="-L$d/lib"
19@@ -8208,6 +8208,10 @@
20                    # and libdb-4.0.a.  Debian has /usr/lib/libdb-4.1.a, for
21                    # instance.  Look for the appropriate library.
22                     if test $v = db4; then
23+                                               save_CFLAGS="$CFLAGS"
24+                                               save_LDFLAGS="$LDFLAGS"
25+                                               CFLAGS="$CFLAGS $BERKELEY_DB_CFLAGS"
26+                                               LDFLAGS="$LDFLAGS $BERKELEY_DB_LDFLAGS"
27                        echo "$as_me:$LINENO: checking for library containing db_create" >&5
28 echo $ECHO_N "checking for library containing db_create... $ECHO_C" >&6
29 if test "${ac_cv_search_db_create+set}" = set; then
30@@ -8334,6 +8338,8 @@
31   BERKELEY_DB_LIB=$ac_cv_search_db_create
32 fi
33 
34+CFLAGS="$save_CFLAGS"
35+LDFLAGS="$save_LDFLAGS"
36                    else
37                        BERKELEY_DB_LIB="-l$v"
38                     fi
39@@ -8631,7 +8637,7 @@
40    { (exit 1); exit 1; }; }
41 else
42     if test x"$OPENSSL_LIB_DIR" = xyes ; then
43-        for d in /opt/ssl /usr/local/ssl /usr/local /usr; do
44+        for d in $prefix/ssl /opt/ssl /usr/local/ssl /usr/local /usr; do
45             if test -f "$d/include/openssl/opensslv.h"; then
46                 OPENSSL_LIB_LDFLAGS="-L$d/lib"
47                 OPENSSL_LIB_CPPFLAGS="-I$d/include"
48@@ -9656,7 +9662,7 @@
49 cat >>conftest.$ac_ext <<_ACEOF
50 /* end confdefs.h.  */
51 $ac_includes_default
52-#include <$ac_header>
53+#include <sys/$ac_header>
54 _ACEOF
55 rm -f conftest.$ac_objext
56 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
57@@ -9700,7 +9706,7 @@
58 cat confdefs.h >>conftest.$ac_ext
59 cat >>conftest.$ac_ext <<_ACEOF
60 /* end confdefs.h.  */
61-#include <$ac_header>
62+#include <sys/$ac_header>
63 _ACEOF
64 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
65   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
Note: See TracBrowser for help on using the repository browser.