296 lines
8.9 KiB
Text
296 lines
8.9 KiB
Text
$NetBSD: patch-ac,v 1.6 2007/07/09 03:51:33 minskim Exp $
|
|
|
|
--- configure.orig 2002-07-08 23:17:13.000000000 -0700
|
|
+++ configure
|
|
@@ -47,6 +47,8 @@ ac_help="$ac_help
|
|
ac_help="$ac_help
|
|
--disable-lckpwdf do not use the lckpwdf function"
|
|
ac_help="$ac_help
|
|
+ --disable-crack do not use crack"
|
|
+ac_help="$ac_help
|
|
--with-mailspool path to mail spool directory
|
|
[default _PATH_MAILDIR if defined in paths.h, otherwise /var/spool/mail]"
|
|
|
|
@@ -1170,8 +1172,17 @@ fi
|
|
|
|
|
|
|
|
+# Check whether --enable-crack or --disable-crack was given.
|
|
+if test "${enable_crack+set}" = set; then
|
|
+ enableval="$enable_crack"
|
|
+ WITH_CRACK=no
|
|
+else
|
|
+ WITH_CRACK=yes
|
|
+fi
|
|
+
|
|
+
|
|
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
|
-echo "configure:1175: checking how to run the C preprocessor" >&5
|
|
+echo "configure:1186: checking how to run the C preprocessor" >&5
|
|
# On Suns, sometimes $CPP names a directory.
|
|
if test -n "$CPP" && test -d "$CPP"; then
|
|
CPP=
|
|
@@ -1461,8 +1472,9 @@ fi
|
|
|
|
|
|
|
|
+if test "$WITH_CRACK" = "yes"; then
|
|
echo $ac_n "checking for FascistCheck in -lcrack""... $ac_c" 1>&6
|
|
-echo "configure:1466: checking for FascistCheck in -lcrack" >&5
|
|
+echo "configure:1478: checking for FascistCheck in -lcrack" >&5
|
|
ac_lib_var=`echo crack'_'FascistCheck | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -1505,11 +1517,14 @@ else
|
|
HAVE_LIBCRACK=no
|
|
fi
|
|
|
|
+else
|
|
+HAVE_LIBCRACK=no
|
|
+fi
|
|
|
|
|
|
-echo $ac_n "checking for fcrypt in -lcrypt""... $ac_c" 1>&6
|
|
-echo "configure:1512: checking for fcrypt in -lcrypt" >&5
|
|
-ac_lib_var=`echo crypt'_'fcrypt | sed 'y%./+-%__p_%'`
|
|
+echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
|
|
+echo "configure:1527: checking for crypt in -lcrypt" >&5
|
|
+ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -1521,13 +1536,13 @@ cat > conftest.$ac_ext <<EOF
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
/* We use char because int might match the return type of a gcc2
|
|
builtin and then its argument prototype would still apply. */
|
|
-char fcrypt();
|
|
+char crypt();
|
|
|
|
int main() {
|
|
-fcrypt()
|
|
+crypt()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:1546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
|
else
|
|
@@ -1733,8 +1748,53 @@ fi
|
|
|
|
fi
|
|
|
|
+echo $ac_n "checking for db_create in -ldb4""... $ac_c" 1>&6
|
|
+echo "configure:1753: checking for db_create in -ldb4" >&5
|
|
+ac_lib_var=`echo db4'_'db_create | sed 'y%./+-%__p_%'`
|
|
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
+ echo $ac_n "(cached) $ac_c" 1>&6
|
|
+else
|
|
+ ac_save_LIBS="$LIBS"
|
|
+LIBS="-ldb4 $LIBS"
|
|
+cat > conftest.$ac_ext <<EOF
|
|
+#line 1761 "configure"
|
|
+#include "confdefs.h"
|
|
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
+/* We use char because int might match the return type of a gcc2
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+char db_create();
|
|
+
|
|
+int main() {
|
|
+db_create()
|
|
+; return 0; }
|
|
+EOF
|
|
+if { (eval echo configure:1772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_lib_$ac_lib_var=yes"
|
|
+else
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_lib_$ac_lib_var=no"
|
|
+fi
|
|
+rm -f conftest*
|
|
+LIBS="$ac_save_LIBS"
|
|
+
|
|
+fi
|
|
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ HAVE_LIBDB4=yes ; cat >> confdefs.h <<\EOF
|
|
+#define HAVE_LIBDB4 1
|
|
+EOF
|
|
+
|
|
+else
|
|
+ echo "$ac_t""no" 1>&6
|
|
+HAVE_LIBDB4=no
|
|
+fi
|
|
+
|
|
+
|
|
echo $ac_n "checking for yylex in -lfl""... $ac_c" 1>&6
|
|
-echo "configure:1738: checking for yylex in -lfl" >&5
|
|
+echo "configure:1798: checking for yylex in -lfl" >&5
|
|
ac_lib_var=`echo fl'_'yylex | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -2312,6 +2372,143 @@ fi
|
|
done
|
|
|
|
|
|
+for ac_hdr in termios.h
|
|
+do
|
|
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
+echo "configure:2380: checking for $ac_hdr" >&5
|
|
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
+ echo $ac_n "(cached) $ac_c" 1>&6
|
|
+else
|
|
+ cat > conftest.$ac_ext <<EOF
|
|
+#line 2385 "configure"
|
|
+#include "confdefs.h"
|
|
+#include <$ac_hdr>
|
|
+EOF
|
|
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
+{ (eval echo configure:2390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
+if test -z "$ac_err"; then
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_header_$ac_safe=yes"
|
|
+else
|
|
+ echo "$ac_err" >&5
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_header_$ac_safe=no"
|
|
+fi
|
|
+rm -f conftest*
|
|
+fi
|
|
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
|
|
+ cat >> confdefs.h <<EOF
|
|
+#define $ac_tr_hdr 1
|
|
+EOF
|
|
+
|
|
+else
|
|
+ echo "$ac_t""no" 1>&6
|
|
+fi
|
|
+done
|
|
+
|
|
+
|
|
+for ac_hdr in shadow.h
|
|
+do
|
|
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
+echo "configure:2421: checking for $ac_hdr" >&5
|
|
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
+ echo $ac_n "(cached) $ac_c" 1>&6
|
|
+else
|
|
+ cat > conftest.$ac_ext <<EOF
|
|
+#line 2426 "configure"
|
|
+#include "confdefs.h"
|
|
+#include <$ac_hdr>
|
|
+EOF
|
|
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
+{ (eval echo configure:2431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
+if test -z "$ac_err"; then
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_header_$ac_safe=yes"
|
|
+else
|
|
+ echo "$ac_err" >&5
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_header_$ac_safe=no"
|
|
+fi
|
|
+rm -f conftest*
|
|
+fi
|
|
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
|
|
+ cat >> confdefs.h <<EOF
|
|
+#define $ac_tr_hdr 1
|
|
+EOF
|
|
+
|
|
+else
|
|
+ echo "$ac_t""no" 1>&6
|
|
+fi
|
|
+done
|
|
+
|
|
+for ac_func in getspnam
|
|
+do
|
|
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
+echo "configure:2460: checking for $ac_func" >&5
|
|
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
|
+ echo $ac_n "(cached) $ac_c" 1>&6
|
|
+else
|
|
+ cat > conftest.$ac_ext <<EOF
|
|
+#line 2465 "configure"
|
|
+#include "confdefs.h"
|
|
+/* System header to define __stub macros and hopefully few prototypes,
|
|
+ which can conflict with char $ac_func(); below. */
|
|
+#include <assert.h>
|
|
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
+/* We use char because int might match the return type of a gcc2
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+char $ac_func();
|
|
+
|
|
+int main() {
|
|
+
|
|
+/* The GNU C library defines this for functions which it implements
|
|
+ to always fail with ENOSYS. Some functions are actually named
|
|
+ something starting with __ and the normal name is an alias. */
|
|
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
|
+choke me
|
|
+#else
|
|
+$ac_func();
|
|
+#endif
|
|
+
|
|
+; return 0; }
|
|
+EOF
|
|
+if { (eval echo configure:2488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_func_$ac_func=yes"
|
|
+else
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_func_$ac_func=no"
|
|
+fi
|
|
+rm -f conftest*
|
|
+fi
|
|
+
|
|
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
|
+ cat >> confdefs.h <<EOF
|
|
+#define $ac_tr_func 1
|
|
+EOF
|
|
+
|
|
+else
|
|
+ echo "$ac_t""no" 1>&6
|
|
+fi
|
|
+done
|
|
+
|
|
+
|
|
for ac_hdr in crypt.h
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
@@ -2439,8 +2636,8 @@ done
|
|
|
|
|
|
echo $ac_n "checking path to cracklib dictionary""... $ac_c" 1>&6
|
|
-echo "configure:2443: checking path to cracklib dictionary" >&5
|
|
-DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \
|
|
+echo "configure:2640: checking path to cracklib dictionary" >&5
|
|
+DICT_DIR_CANDIDATES="${prefix}/libdata /usr/lib /usr/share/dict /usr/share/lib \
|
|
/usr/local/lib /usr/local/share/lib"
|
|
DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
|
|
CRACKLIB_DICTPATH=""
|
|
@@ -3646,6 +3843,7 @@ s%@HAVE_LIBCRYPT@%$HAVE_LIBCRYPT%g
|
|
s%@HAVE_LIBUTIL@%$HAVE_LIBUTIL%g
|
|
s%@HAVE_LIBNDBM@%$HAVE_LIBNDBM%g
|
|
s%@HAVE_LIBDB@%$HAVE_LIBDB%g
|
|
+s%@HAVE_LIBDB4@%$HAVE_LIBDB4%g
|
|
s%@HAVE_LIBFL@%$HAVE_LIBFL%g
|
|
s%@HAVE_LIBNSL@%$HAVE_LIBNSL%g
|
|
s%@HAVE_LIBPWDB@%$HAVE_LIBPWDB%g
|