dbc44398c0
installation ordering, multiple source capability and several other unique features. WWW: http://packages.debian.org/apt PR: ports/105563 Submitted by: Nick Barkas <snb at threerings.net>
161 lines
4.6 KiB
Text
161 lines
4.6 KiB
Text
--- configure.orig Wed Oct 11 00:03:36 2006
|
|
+++ configure Thu Oct 26 14:32:09 2006
|
|
@@ -7523,8 +7523,8 @@
|
|
|
|
|
|
|
|
-{ echo "$as_me:$LINENO: checking for h_errno" >&5
|
|
-echo $ECHO_N "checking for h_errno... $ECHO_C" >&6; }
|
|
+{ echo "$as_me:$LINENO: checking if netdb.h declares h_errno" >&5
|
|
+echo $ECHO_N "checking if netdb.h declares h_errno... $ECHO_C" >&6; }
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -7533,14 +7533,51 @@
|
|
/* end confdefs.h. */
|
|
#include <netdb.h>
|
|
|
|
+int main() { return h_errno; }
|
|
+
|
|
_ACEOF
|
|
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
- $EGREP "h_errno" >/dev/null 2>&1; then
|
|
- { echo "$as_me:$LINENO: result: normal" >&5
|
|
-echo "${ECHO_T}normal" >&6; }
|
|
+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
|
|
+
|
|
+ aptget_cv_netdb_declares_h_errno=yes
|
|
+
|
|
else
|
|
- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ aptget_cv_netdb_declares_h_errno=no
|
|
+
|
|
+fi
|
|
+rm -f conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+
|
|
+if test "x$aptget_cv_netdb_declares_h_errno" = "xno"; then
|
|
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
|
|
+fi
|
|
+
|
|
+cat >conftest.$ac_ext <<_ACEOF
|
|
+
|
|
+
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
@@ -7548,22 +7585,52 @@
|
|
/* end confdefs.h. */
|
|
#include <netdb.h>
|
|
|
|
+int main() { return h_errno; }
|
|
+
|
|
_ACEOF
|
|
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
- $EGREP "h_errno" >/dev/null 2>&1; then
|
|
- { echo "$as_me:$LINENO: result: needs _XOPEN_SOURCE_EXTENDED" >&5
|
|
-echo "${ECHO_T}needs _XOPEN_SOURCE_EXTENDED" >&6; }
|
|
+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
|
|
+
|
|
+ aptget_cv_netdb_declares_h_errno=yes
|
|
+
|
|
else
|
|
- { { echo "$as_me:$LINENO: error: \"not found.\"" >&5
|
|
-echo "$as_me: error: \"not found.\"" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-fi
|
|
-rm -f conftest*
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
+ aptget_cv_netdb_declares_h_errno=no
|
|
|
|
fi
|
|
-rm -f conftest*
|
|
+rm -f conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
|
+echo "$as_me:$LINENO: result: $aptget_cv_netdb_declares_h_errno" >&5
|
|
+echo "${ECHO_T}$aptget_cv_netdb_declares_h_errno" >&6
|
|
+
|
|
+if test "x$aptget_cv_netdb_declares_h_errno" = "xno"; then
|
|
+ { { echo "$as_me:$LINENO: error: h_errno is required" >&5
|
|
+echo "$as_me: error: h_errno is required" >&2;}
|
|
+ { (exit 1); exit 1; }; }
|
|
+fi
|
|
|
|
# Extract the first word of "debiandoc2html", so it can be a program name with args.
|
|
set dummy debiandoc2html; ac_word=$2
|
|
@@ -7942,15 +8009,16 @@
|
|
{ echo "$as_me:$LINENO: result: $GLIBC_VER" >&5
|
|
echo "${ECHO_T}$GLIBC_VER" >&6; }
|
|
ac_cv_glibc_ver=$GLIBC_VER
|
|
+ GLIBC_VER="-$ac_cv_glibc_ver"
|
|
else
|
|
{ echo "$as_me:$LINENO: WARNING: cannot determine GNU C library minor version number" >&5
|
|
echo "$as_me: WARNING: cannot determine GNU C library minor version number" >&2;}
|
|
+ GLIBC_VER=""
|
|
fi
|
|
rm -f $dummy $dummy.c
|
|
|
|
fi
|
|
|
|
- GLIBC_VER="-$ac_cv_glibc_ver"
|
|
|
|
|
|
{ echo "$as_me:$LINENO: checking libstdc++ version" >&5
|
|
@@ -11448,7 +11516,7 @@
|
|
;;
|
|
esac
|
|
done ;;
|
|
- "default":C) make -s dirs ;;
|
|
+ "default":C) gmake -s dirs ;;
|
|
|
|
esac
|
|
done # for ac_tag
|