158 lines
4 KiB
Text
158 lines
4 KiB
Text
$NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
|
|
|
|
--- configure.orig Sun Feb 16 12:46:32 2003
|
|
+++ configure Sun Feb 23 16:55:12 2003
|
|
@@ -8084,64 +8084,6 @@
|
|
fi
|
|
|
|
|
|
-echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
|
|
-echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6
|
|
-if test "${ac_cv_lib_crypt_main+set}" = set; then
|
|
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
-else
|
|
- ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lcrypt $LIBS"
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-#line $LINENO "configure"
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-main ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
- (eval $ac_link) 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } &&
|
|
- { ac_try='test -s conftest$ac_exeext'
|
|
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
- (eval $ac_try) 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
- ac_cv_lib_crypt_main=yes
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-ac_cv_lib_crypt_main=no
|
|
-fi
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
|
-LIBS=$ac_check_lib_save_LIBS
|
|
-fi
|
|
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_main" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_crypt_main" >&6
|
|
-if test $ac_cv_lib_crypt_main = yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define HAVE_LIBCRYPT 1
|
|
-_ACEOF
|
|
-
|
|
- LIBS="-lcrypt $LIBS"
|
|
-
|
|
-fi
|
|
-
|
|
-
|
|
echo "$as_me:$LINENO: checking for main in -ld" >&5
|
|
echo $ECHO_N "checking for main in -ld... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_d_main+set}" = set; then
|
|
@@ -13066,13 +13008,13 @@
|
|
savedldflags="$LDFLAGS"
|
|
CFLAGS="$CFLAGS -I$bdbdir"
|
|
LDFLAGS="-L$bdblibdir $LDFLAGS"
|
|
- echo "$as_me:$LINENO: checking for main in -ldb" >&5
|
|
-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
|
|
+ echo "$as_me:$LINENO: checking for main in -ldb3" >&5
|
|
+echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_db_main+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-ldb $LIBS"
|
|
+LIBS="-ldb3 $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
/* confdefs.h. */
|
|
@@ -13118,7 +13060,7 @@
|
|
|
|
bdbfound=yes
|
|
BDB_CFLAGS="-I$bdbdir"
|
|
- BDB_LIBS="-L$bdblibdir -ldb"
|
|
+ BDB_LIBS="-L$bdblibdir -ldb3"
|
|
BDB_BIN=$bdbbindir
|
|
BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
|
|
|
|
@@ -14552,7 +14494,62 @@
|
|
fi
|
|
|
|
|
|
+echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
|
|
+echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6
|
|
+if test "${ac_cv_lib_crypt_main+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+else
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-lcrypt $LIBS"
|
|
+cat >conftest.$ac_ext <<_ACEOF
|
|
+#line $LINENO "configure"
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+main ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
+ (eval $ac_link) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } &&
|
|
+ { ac_try='test -s conftest$ac_exeext'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; }; then
|
|
+ ac_cv_lib_crypt_main=yes
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ac_cv_lib_crypt_main=no
|
|
+fi
|
|
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_main" >&5
|
|
+echo "${ECHO_T}$ac_cv_lib_crypt_main" >&6
|
|
+if test $ac_cv_lib_crypt_main = yes; then
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_LIBCRYPT 1
|
|
+_ACEOF
|
|
+
|
|
+ LIBS="-lcrypt $LIBS"
|
|
|
|
+fi
|
|
|
|
|
|
# Check whether --enable-pgp-uam or --disable-pgp-uam was given.
|