17387554d5
using information stored in a MySQL database. Based on pkgwip package done by cube@, thanks a lot! Package should support both Apache 1.x and 2.x, but only Apache 1.x tested at the moment.
261 lines
7.7 KiB
Text
261 lines
7.7 KiB
Text
$NetBSD: patch-ac,v 1.1.1.1 2004/07/16 11:28:19 jdolecek Exp $
|
|
|
|
--- configure.orig 2004-05-11 07:19:18.000000000 +0200
|
|
+++ configure 2004-07-16 12:40:48.000000000 +0200
|
|
@@ -953,7 +953,7 @@
|
|
else
|
|
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
|
fi
|
|
- cd "$ac_popdir"
|
|
+ cd $ac_popdir
|
|
done
|
|
fi
|
|
|
|
@@ -1886,7 +1886,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -1944,7 +1945,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2060,7 +2062,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2114,7 +2117,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2159,7 +2163,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2203,7 +2208,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2282,7 +2288,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2765,7 +2772,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2935,7 +2943,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3002,7 +3011,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3118,7 +3128,81 @@
|
|
done
|
|
|
|
|
|
-if test -n $HAVE_CRYPT_H; then
|
|
+echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
|
|
+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
|
|
+if test "${ac_cv_lib_crypt_crypt+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
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+
|
|
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+/* We use char because int might match the return type of a gcc2
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+char crypt ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+crypt ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+rm -f conftest.$ac_objext conftest$ac_exeext
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
+ (eval $ac_link) 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } &&
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
+ { (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); }; } &&
|
|
+ { 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_crypt=yes
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ac_cv_lib_crypt_crypt=no
|
|
+fi
|
|
+rm -f conftest.err 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_crypt" >&5
|
|
+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
|
|
+if test $ac_cv_lib_crypt_crypt = yes; then
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_LIBCRYPT 1
|
|
+_ACEOF
|
|
+
|
|
+ LIBS="-lcrypt $LIBS"
|
|
+
|
|
+fi
|
|
+
|
|
+
|
|
+if test -n $HAVE_CRYPT_H -a $HAVE_LIBCRYPT; then
|
|
if test "$cross_compiling" = yes; then
|
|
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
|
See \`config.log' for more details." >&5
|
|
@@ -3133,7 +3217,9 @@
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
|
|
+#ifdef HAVE_CRYPT_H
|
|
#include <crypt.h>
|
|
+#endif
|
|
#include <string.h>
|
|
|
|
int main()
|
|
@@ -3181,7 +3267,9 @@
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
|
|
+#ifdef HAVE_CRYPT_H
|
|
#include <crypt.h>
|
|
+#endif
|
|
#include <string.h>
|
|
|
|
int main()
|
|
@@ -3294,7 +3382,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3366,7 +3455,8 @@
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -4187,6 +4277,11 @@
|
|
|
|
|
|
|
|
+ if test x"$ac_file" != x-; then
|
|
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
+echo "$as_me: creating $ac_file" >&6;}
|
|
+ rm -f "$ac_file"
|
|
+ fi
|
|
# Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
# use $as_me), people would be surprised to read:
|
|
# /* config.h. Generated by config.status. */
|
|
@@ -4225,12 +4320,6 @@
|
|
fi;;
|
|
esac
|
|
done` || { (exit 1); exit 1; }
|
|
-
|
|
- if test x"$ac_file" != x-; then
|
|
- { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
-echo "$as_me: creating $ac_file" >&6;}
|
|
- rm -f "$ac_file"
|
|
- fi
|
|
_ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF
|
|
sed "$ac_vpsub
|