You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
227 lines
7.7 KiB
227 lines
7.7 KiB
## |
|
## rpm-4.0.2.patch.regen -- Annotated patch file |
|
## Copyright (c) 2000-2001 Cable & Wireless Deutschland GmbH |
|
## Copyright (c) 2000-2001 Ralf S. Engelschall <rse.com> |
|
## |
|
## This file assembles changes to existing RPM source files between |
|
## the original RedHat RPM and the OpenPKG RPM variant. It can be |
|
## automatically applied to a vanilla RedHat RPM source tree with the |
|
## 'patch' tool to upgrade those files. Each patch snippet is annotated |
|
## with a short description. |
|
## |
|
## Created on: 23-Sep-2001 |
|
## |
|
|
|
+--------------------------------------------------------------------------- |
|
| Regenerated configure script from GNU autoconf run after |
|
| the patches for configure.in were applied. |
|
+--------------------------------------------------------------------------- |
|
Index: configure |
|
--- configure 2001/02/26 21:52:29 1.1.1.16 |
|
+++ configure 2001/07/05 11:44:33 1.13 |
|
@@ -1879,7 +1879,7 @@ |
|
fi |
|
|
|
|
|
-for ac_prog in gawk mawk nawk awk |
|
+for ac_prog in mawk gawk nawk awk |
|
do |
|
# Extract the first word of "$ac_prog", so it can be a program name with args. |
|
set dummy $ac_prog; ac_word=$2 |
|
@@ -9055,13 +9055,63 @@ |
|
else |
|
echo "$ac_t""no" 1>&6 |
|
|
|
+ echo $ac_n "checking for getmntinfo""... $ac_c" 1>&6 |
|
+echo "configure:9060: checking for getmntinfo" >&5 |
|
+if eval "test \"`echo '$''{'ac_cv_func_getmntinfo'+set}'`\" = set"; then |
|
+ echo $ac_n "(cached) $ac_c" 1>&6 |
|
+else |
|
+ cat > conftest.$ac_ext <<EOF |
|
+#line 9065 "configure" |
|
+#include "confdefs.h" |
|
+/* System header to define __stub macros and hopefully few prototypes, |
|
+ which can conflict with char getmntinfo(); 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 getmntinfo(); |
|
+ |
|
+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_getmntinfo) || defined (__stub___getmntinfo) |
|
+choke me |
|
+#else |
|
+getmntinfo(); |
|
+#endif |
|
+ |
|
+; return 0; } |
|
+EOF |
|
+if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
|
+ rm -rf conftest* |
|
+ eval "ac_cv_func_getmntinfo=yes" |
|
+else |
|
+ echo "configure: failed program was:" >&5 |
|
+ cat conftest.$ac_ext >&5 |
|
+ rm -rf conftest* |
|
+ eval "ac_cv_func_getmntinfo=no" |
|
+fi |
|
+rm -f conftest* |
|
+fi |
|
+ |
|
+if eval "test \"`echo '$ac_cv_func_'getmntinfo`\" = yes"; then |
|
+ echo "$ac_t""yes" 1>&6 |
|
+ cat >> confdefs.h <<\EOF |
|
+#define HAVE_GETMNTINFO 1 |
|
+EOF |
|
+ |
|
+else |
|
+ echo "$ac_t""no" 1>&6 |
|
+ |
|
echo $ac_n "checking for mntctl""... $ac_c" 1>&6 |
|
-echo "configure:9060: checking for mntctl" >&5 |
|
+echo "configure:9110: checking for mntctl" >&5 |
|
if eval "test \"`echo '$''{'ac_cv_func_mntctl'+set}'`\" = set"; then |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
|
else |
|
cat > conftest.$ac_ext <<EOF |
|
-#line 9065 "configure" |
|
+#line 9115 "configure" |
|
#include "confdefs.h" |
|
/* System header to define __stub macros and hopefully few prototypes, |
|
which can conflict with char mntctl(); below. */ |
|
@@ -9084,7 +9134,7 @@ |
|
|
|
; return 0; } |
|
EOF |
|
-if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
|
+if { (eval echo configure:9138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
|
rm -rf conftest* |
|
eval "ac_cv_func_mntctl=yes" |
|
else |
|
@@ -9106,12 +9156,12 @@ |
|
echo "$ac_t""no" 1>&6 |
|
|
|
echo $ac_n "checking for getmntinfo_r""... $ac_c" 1>&6 |
|
-echo "configure:9110: checking for getmntinfo_r" >&5 |
|
+echo "configure:9160: checking for getmntinfo_r" >&5 |
|
if eval "test \"`echo '$''{'ac_cv_func_getmntinfo_r'+set}'`\" = set"; then |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
|
else |
|
cat > conftest.$ac_ext <<EOF |
|
-#line 9115 "configure" |
|
+#line 9165 "configure" |
|
#include "confdefs.h" |
|
/* System header to define __stub macros and hopefully few prototypes, |
|
which can conflict with char getmntinfo_r(); below. */ |
|
@@ -9134,7 +9184,7 @@ |
|
|
|
; return 0; } |
|
EOF |
|
-if { (eval echo configure:9138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
|
+if { (eval echo configure:9188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
|
rm -rf conftest* |
|
eval "ac_cv_func_getmntinfo_r=yes" |
|
else |
|
@@ -9156,7 +9206,7 @@ |
|
echo "$ac_t""no" 1>&6 |
|
|
|
echo $ac_n "checking for getmntinfo_r in -lc_r""... $ac_c" 1>&6 |
|
-echo "configure:9160: checking for getmntinfo_r in -lc_r" >&5 |
|
+echo "configure:9210: checking for getmntinfo_r in -lc_r" >&5 |
|
ac_lib_var=`echo c_r'_'getmntinfo_r | sed 'y%./+-%__p_%'` |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
|
@@ -9164,7 +9214,7 @@ |
|
ac_save_LIBS="$LIBS" |
|
LIBS="-lc_r $LIBS" |
|
cat > conftest.$ac_ext <<EOF |
|
-#line 9168 "configure" |
|
+#line 9218 "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 |
|
@@ -9175,7 +9225,7 @@ |
|
getmntinfo_r() |
|
; return 0; } |
|
EOF |
|
-if { (eval echo configure:9179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
|
+if { (eval echo configure:9229: \"$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 |
|
@@ -9211,14 +9261,16 @@ |
|
|
|
fi |
|
|
|
+fi |
|
+ |
|
|
|
echo $ac_n "checking for lchown""... $ac_c" 1>&6 |
|
-echo "configure:9217: checking for lchown" >&5 |
|
+echo "configure:9269: checking for lchown" >&5 |
|
if eval "test \"`echo '$''{'ac_cv_func_lchown'+set}'`\" = set"; then |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
|
else |
|
cat > conftest.$ac_ext <<EOF |
|
-#line 9222 "configure" |
|
+#line 9274 "configure" |
|
#include "confdefs.h" |
|
/* System header to define __stub macros and hopefully few prototypes, |
|
which can conflict with char lchown(); below. */ |
|
@@ -9241,7 +9293,7 @@ |
|
|
|
; return 0; } |
|
EOF |
|
-if { (eval echo configure:9245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
|
+if { (eval echo configure:9297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
|
rm -rf conftest* |
|
eval "ac_cv_func_lchown=yes" |
|
else |
|
@@ -9266,7 +9318,7 @@ |
|
__CHOWN_RHF="%{__chown} -Rf" |
|
__CHGRP_RHF="%{__chgrp} -Rf" |
|
echo $ac_n "checking whether chown() follows symlinks""... $ac_c" 1>&6 |
|
-echo "configure:9270: checking whether chown() follows symlinks" >&5 |
|
+echo "configure:9322: checking whether chown() follows symlinks" >&5 |
|
# Check whether --enable-broken-chown or --disable-broken-chown was given. |
|
if test "${enable_broken_chown+set}" = set; then |
|
enableval="$enable_broken_chown" |
|
@@ -9294,7 +9346,7 @@ |
|
${__RM} -f foo bar |
|
else |
|
echo $ac_n "checking (cannot check by non-root user)""... $ac_c" 1>&6 |
|
-echo "configure:9298: checking (cannot check by non-root user)" >&5 |
|
+echo "configure:9350: checking (cannot check by non-root user)" >&5 |
|
result=no |
|
fi |
|
fi |
|
@@ -9312,13 +9364,13 @@ |
|
|
|
|
|
echo $ac_n "checking root's primary group""... $ac_c" 1>&6 |
|
-echo "configure:9316: checking root's primary group" >&5 |
|
+echo "configure:9368: checking root's primary group" >&5 |
|
if test "$cross_compiling" = yes; then |
|
ROOT_GROUP="root" |
|
|
|
else |
|
cat > conftest.$ac_ext <<EOF |
|
-#line 9322 "configure" |
|
+#line 9374 "configure" |
|
#include "confdefs.h" |
|
#include <stdio.h> |
|
#include <sys/types.h> |
|
@@ -9347,7 +9399,7 @@ |
|
exit(1); |
|
} |
|
EOF |
|
-if { (eval echo configure:9351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
|
+if { (eval echo configure:9403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
|
then |
|
ROOT_GROUP=`cat conftest_rootg` |
|
else
|
|
|