Skip to content

P
Postgres FD Implementation
Commit 379268aa authored by Tom Lane's avatar Tom Lane
Browse files
Options

Proper fix for glibc getopt() botch. Surprising we did not see this 

before.
parent 58f6b951
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 75 deletions
configure
View file @ 379268aa
...@@ -7475,22 +7475,55 @@ EOF ...@@ -7475,22 +7475,55 @@ EOF
fi fi
echo $ac_n "checking for __getopt_initialized""... $ac_c" 1>&6
echo "configure:7480: checking for __getopt_initialized" >&5
if eval "test \"`echo '$''{'pgac_cv_var_int___getopt_initialized'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 7485 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
extern int __getopt_initialized; __getopt_initialized = 1;
; return 0; }
EOF
if { (eval echo configure:7492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
pgac_cv_var_int___getopt_initialized=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
pgac_cv_var_int___getopt_initialized=no
fi
rm -f conftest*
fi
echo "$ac_t""$pgac_cv_var_int___getopt_initialized" 1>&6
if test x"$pgac_cv_var_int___getopt_initialized" = x"yes"; then
cat >> confdefs.h <<\EOF
#define HAVE_INT___GETOPT_INITIALIZED 1
EOF
fi
# This test makes sure that run tests work at all. Sometimes a shared # This test makes sure that run tests work at all. Sometimes a shared
# library is found by the linker, but the runtime linker can't find it. # library is found by the linker, but the runtime linker can't find it.
# This check should come after all modifications of compiler or linker # This check should come after all modifications of compiler or linker
# variables, and before any other run tests. # variables, and before any other run tests.
echo $ac_n "checking test program""... $ac_c" 1>&6 echo $ac_n "checking test program""... $ac_c" 1>&6
echo "configure:7485: checking test program" >&5 echo "configure:7518: checking test program" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
echo "$ac_t""cross-compiling" 1>&6 echo "$ac_t""cross-compiling" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7490 "configure" #line 7523 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { return 0; } int main() { return 0; }
EOF EOF
if { (eval echo configure:7494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
echo "$ac_t""ok" 1>&6 echo "$ac_t""ok" 1>&6
else else
...@@ -7510,7 +7543,7 @@ fi ...@@ -7510,7 +7543,7 @@ fi
echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6 echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6
echo "configure:7514: checking whether long int is 64 bits" >&5 echo "configure:7547: checking whether long int is 64 bits" >&5
if eval "test \"`echo '$''{'pgac_cv_type_long_int_64'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_type_long_int_64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7519,7 +7552,7 @@ else ...@@ -7519,7 +7552,7 @@ else
echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7523 "configure" #line 7556 "configure"
#include "confdefs.h" #include "confdefs.h"
typedef long int int64; typedef long int int64;
...@@ -7548,7 +7581,7 @@ main() { ...@@ -7548,7 +7581,7 @@ main() {
exit(! does_int64_work()); exit(! does_int64_work());
} }
EOF EOF
if { (eval echo configure:7552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_type_long_int_64=yes pgac_cv_type_long_int_64=yes
else else
...@@ -7575,7 +7608,7 @@ fi ...@@ -7575,7 +7608,7 @@ fi
if test x"$HAVE_LONG_INT_64" = x"no" ; then if test x"$HAVE_LONG_INT_64" = x"no" ; then
echo $ac_n "checking whether long long int is 64 bits""... $ac_c" 1>&6 echo $ac_n "checking whether long long int is 64 bits""... $ac_c" 1>&6
echo "configure:7579: checking whether long long int is 64 bits" >&5 echo "configure:7612: checking whether long long int is 64 bits" >&5
if eval "test \"`echo '$''{'pgac_cv_type_long_long_int_64'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_type_long_long_int_64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7584,7 +7617,7 @@ else ...@@ -7584,7 +7617,7 @@ else
echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7588 "configure" #line 7621 "configure"
#include "confdefs.h" #include "confdefs.h"
typedef long long int int64; typedef long long int int64;
...@@ -7613,7 +7646,7 @@ main() { ...@@ -7613,7 +7646,7 @@ main() {
exit(! does_int64_work()); exit(! does_int64_work());
} }
EOF EOF
if { (eval echo configure:7617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_type_long_long_int_64=yes pgac_cv_type_long_long_int_64=yes
else else
...@@ -7643,7 +7676,7 @@ fi ...@@ -7643,7 +7676,7 @@ fi
if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7647 "configure" #line 7680 "configure"
#include "confdefs.h" #include "confdefs.h"
#define INT64CONST(x) x##LL #define INT64CONST(x) x##LL
...@@ -7653,7 +7686,7 @@ int main() { ...@@ -7653,7 +7686,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_LL_CONSTANTS 1 #define HAVE_LL_CONSTANTS 1
...@@ -7671,7 +7704,7 @@ fi ...@@ -7671,7 +7704,7 @@ fi
if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
if [ x$SNPRINTF = x ] ; then if [ x$SNPRINTF = x ] ; then
echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6 echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6
echo "configure:7675: checking whether snprintf handles 'long long int' as %lld" >&5 echo "configure:7708: checking whether snprintf handles 'long long int' as %lld" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
echo "$ac_t""assuming not on target machine" 1>&6 echo "$ac_t""assuming not on target machine" 1>&6
# Force usage of our own snprintf, since we cannot test foreign snprintf # Force usage of our own snprintf, since we cannot test foreign snprintf
...@@ -7680,7 +7713,7 @@ echo "configure:7675: checking whether snprintf handles 'long long int' as %lld" ...@@ -7680,7 +7713,7 @@ echo "configure:7675: checking whether snprintf handles 'long long int' as %lld"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7684 "configure" #line 7717 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
typedef long long int int64; typedef long long int int64;
...@@ -7707,7 +7740,7 @@ main() { ...@@ -7707,7 +7740,7 @@ main() {
exit(! does_int64_snprintf_work()); exit(! does_int64_snprintf_work());
} }
EOF EOF
if { (eval echo configure:7711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
INT64_FORMAT='"%lld"' INT64_FORMAT='"%lld"'
...@@ -7718,7 +7751,7 @@ else ...@@ -7718,7 +7751,7 @@ else
rm -fr conftest* rm -fr conftest*
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6 echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6
echo "configure:7722: checking whether snprintf handles 'long long int' as %qd" >&5 echo "configure:7755: checking whether snprintf handles 'long long int' as %qd" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
echo "$ac_t""assuming not on target machine" 1>&6 echo "$ac_t""assuming not on target machine" 1>&6
# Force usage of our own snprintf, since we cannot test foreign snprintf # Force usage of our own snprintf, since we cannot test foreign snprintf
...@@ -7727,7 +7760,7 @@ echo "configure:7722: checking whether snprintf handles 'long long int' as %qd" ...@@ -7727,7 +7760,7 @@ echo "configure:7722: checking whether snprintf handles 'long long int' as %qd"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7731 "configure" #line 7764 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
typedef long long int int64; typedef long long int int64;
...@@ -7754,7 +7787,7 @@ main() { ...@@ -7754,7 +7787,7 @@ main() {
exit(! does_int64_snprintf_work()); exit(! does_int64_snprintf_work());
} }
EOF EOF
if { (eval echo configure:7758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
INT64_FORMAT='"%qd"' INT64_FORMAT='"%qd"'
...@@ -7794,12 +7827,12 @@ EOF ...@@ -7794,12 +7827,12 @@ EOF
for ac_func in strtoll strtoq for ac_func in strtoll strtoq
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:7798: checking for $ac_func" >&5 echo "configure:7831: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7803 "configure" #line 7836 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -7822,7 +7855,7 @@ $ac_func(); ...@@ -7822,7 +7855,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -7849,12 +7882,12 @@ done ...@@ -7849,12 +7882,12 @@ done
for ac_func in strtoull strtouq for ac_func in strtoull strtouq
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:7853: checking for $ac_func" >&5 echo "configure:7886: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7858 "configure" #line 7891 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -7877,7 +7910,7 @@ $ac_func(); ...@@ -7877,7 +7910,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -7903,12 +7936,12 @@ done ...@@ -7903,12 +7936,12 @@ done
echo $ac_n "checking for atexit""... $ac_c" 1>&6 echo $ac_n "checking for atexit""... $ac_c" 1>&6
echo "configure:7907: checking for atexit" >&5 echo "configure:7940: checking for atexit" >&5
if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7912 "configure" #line 7945 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char atexit(); below. */ which can conflict with char atexit(); below. */
...@@ -7931,7 +7964,7 @@ atexit(); ...@@ -7931,7 +7964,7 @@ atexit();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_atexit=yes" eval "ac_cv_func_atexit=yes"
else else
...@@ -7954,12 +7987,12 @@ else ...@@ -7954,12 +7987,12 @@ else
for ac_func in on_exit for ac_func in on_exit
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:7958: checking for $ac_func" >&5 echo "configure:7991: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7963 "configure" #line 7996 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -7982,7 +8015,7 @@ $ac_func(); ...@@ -7982,7 +8015,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:8019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -8015,7 +8048,7 @@ fi ...@@ -8015,7 +8048,7 @@ fi
echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6
echo "configure:8019: checking size of unsigned long" >&5 echo "configure:8052: checking size of unsigned long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8023,7 +8056,7 @@ else ...@@ -8023,7 +8056,7 @@ else
ac_cv_sizeof_unsigned_long=4 ac_cv_sizeof_unsigned_long=4
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8027 "configure" #line 8060 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
main() main()
...@@ -8034,7 +8067,7 @@ main() ...@@ -8034,7 +8067,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:8038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:8071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_sizeof_unsigned_long=`cat conftestval` ac_cv_sizeof_unsigned_long=`cat conftestval`
else else
...@@ -8060,7 +8093,7 @@ EOF ...@@ -8060,7 +8093,7 @@ EOF
echo $ac_n "checking alignment of short""... $ac_c" 1>&6 echo $ac_n "checking alignment of short""... $ac_c" 1>&6
echo "configure:8064: checking alignment of short" >&5 echo "configure:8097: checking alignment of short" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_short'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_alignof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8068,7 +8101,7 @@ else ...@@ -8068,7 +8101,7 @@ else
pgac_cv_alignof_short='sizeof(short)' pgac_cv_alignof_short='sizeof(short)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8072 "configure" #line 8105 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; short field; } mystruct; struct { char filler; short field; } mystruct;
...@@ -8080,7 +8113,7 @@ main() ...@@ -8080,7 +8113,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:8084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:8117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_alignof_short=`cat conftestval` pgac_cv_alignof_short=`cat conftestval`
else else
...@@ -8100,7 +8133,7 @@ EOF ...@@ -8100,7 +8133,7 @@ EOF
echo $ac_n "checking alignment of int""... $ac_c" 1>&6 echo $ac_n "checking alignment of int""... $ac_c" 1>&6
echo "configure:8104: checking alignment of int" >&5 echo "configure:8137: checking alignment of int" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_int'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_alignof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8108,7 +8141,7 @@ else ...@@ -8108,7 +8141,7 @@ else
pgac_cv_alignof_int='sizeof(int)' pgac_cv_alignof_int='sizeof(int)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8112 "configure" #line 8145 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; int field; } mystruct; struct { char filler; int field; } mystruct;
...@@ -8120,7 +8153,7 @@ main() ...@@ -8120,7 +8153,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:8124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:8157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_alignof_int=`cat conftestval` pgac_cv_alignof_int=`cat conftestval`
else else
...@@ -8140,7 +8173,7 @@ EOF ...@@ -8140,7 +8173,7 @@ EOF
echo $ac_n "checking alignment of long""... $ac_c" 1>&6 echo $ac_n "checking alignment of long""... $ac_c" 1>&6
echo "configure:8144: checking alignment of long" >&5 echo "configure:8177: checking alignment of long" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_long'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_alignof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8148,7 +8181,7 @@ else ...@@ -8148,7 +8181,7 @@ else
pgac_cv_alignof_long='sizeof(long)' pgac_cv_alignof_long='sizeof(long)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8152 "configure" #line 8185 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; long field; } mystruct; struct { char filler; long field; } mystruct;
...@@ -8160,7 +8193,7 @@ main() ...@@ -8160,7 +8193,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:8164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:8197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_alignof_long=`cat conftestval` pgac_cv_alignof_long=`cat conftestval`
else else
...@@ -8181,7 +8214,7 @@ EOF ...@@ -8181,7 +8214,7 @@ EOF
if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6 echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6
echo "configure:8185: checking alignment of long long int" >&5 echo "configure:8218: checking alignment of long long int" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_long_long_int'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_alignof_long_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8189,7 +8222,7 @@ else ...@@ -8189,7 +8222,7 @@ else
pgac_cv_alignof_long_long_int='sizeof(long long int)' pgac_cv_alignof_long_long_int='sizeof(long long int)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8193 "configure" #line 8226 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; long long int field; } mystruct; struct { char filler; long long int field; } mystruct;
...@@ -8201,7 +8234,7 @@ main() ...@@ -8201,7 +8234,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:8205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:8238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_alignof_long_long_int=`cat conftestval` pgac_cv_alignof_long_long_int=`cat conftestval`
else else
...@@ -8222,7 +8255,7 @@ EOF ...@@ -8222,7 +8255,7 @@ EOF
fi fi
echo $ac_n "checking alignment of double""... $ac_c" 1>&6 echo $ac_n "checking alignment of double""... $ac_c" 1>&6
echo "configure:8226: checking alignment of double" >&5 echo "configure:8259: checking alignment of double" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_double'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_alignof_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8230,7 +8263,7 @@ else ...@@ -8230,7 +8263,7 @@ else
pgac_cv_alignof_double='sizeof(double)' pgac_cv_alignof_double='sizeof(double)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8234 "configure" #line 8267 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; double field; } mystruct; struct { char filler; double field; } mystruct;
...@@ -8242,7 +8275,7 @@ main() ...@@ -8242,7 +8275,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:8246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:8279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
pgac_cv_alignof_double=`cat conftestval` pgac_cv_alignof_double=`cat conftestval`
else else
...@@ -8280,12 +8313,12 @@ EOF ...@@ -8280,12 +8313,12 @@ EOF
echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6
echo "configure:8284: checking for POSIX signal interface" >&5 echo "configure:8317: checking for POSIX signal interface" >&5
if eval "test \"`echo '$''{'pgac_cv_func_posix_signals'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_func_posix_signals'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8289 "configure" #line 8322 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <signal.h> #include <signal.h>
...@@ -8296,7 +8329,7 @@ act.sa_flags = SA_RESTART; ...@@ -8296,7 +8329,7 @@ act.sa_flags = SA_RESTART;
sigaction(0, &act, &oact); sigaction(0, &act, &oact);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:8300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:8333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
pgac_cv_func_posix_signals=yes pgac_cv_func_posix_signals=yes
else else
...@@ -8326,7 +8359,7 @@ do ...@@ -8326,7 +8359,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:8330: checking for $ac_word" >&5 echo "configure:8363: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8362,7 +8395,7 @@ test -n "$TCLSH" && break ...@@ -8362,7 +8395,7 @@ test -n "$TCLSH" && break
done done
echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
echo "configure:8366: checking for tclConfig.sh" >&5 echo "configure:8399: checking for tclConfig.sh" >&5
# Let user override test # Let user override test
if test -z "$TCL_CONFIG_SH"; then if test -z "$TCL_CONFIG_SH"; then
pgac_test_dirs="$with_tclconfig" pgac_test_dirs="$with_tclconfig"
...@@ -8395,7 +8428,7 @@ fi ...@@ -8395,7 +8428,7 @@ fi
# Check for Tk configuration script tkConfig.sh # Check for Tk configuration script tkConfig.sh
if test "$with_tk" = yes; then if test "$with_tk" = yes; then
echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6
echo "configure:8399: checking for tkConfig.sh" >&5 echo "configure:8432: checking for tkConfig.sh" >&5
# Let user override test # Let user override test
if test -z "$TK_CONFIG_SH"; then if test -z "$TK_CONFIG_SH"; then
pgac_test_dirs="$with_tkconfig $with_tclconfig" pgac_test_dirs="$with_tkconfig $with_tclconfig"
...@@ -8434,7 +8467,7 @@ do ...@@ -8434,7 +8467,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:8438: checking for $ac_word" >&5 echo "configure:8471: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8470,7 +8503,7 @@ do ...@@ -8470,7 +8503,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:8474: checking for $ac_word" >&5 echo "configure:8507: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8501,7 +8534,7 @@ done ...@@ -8501,7 +8534,7 @@ done
echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6 echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6
echo "configure:8505: checking for DocBook V3.1" >&5 echo "configure:8538: checking for DocBook V3.1" >&5
if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8534,7 +8567,7 @@ have_docbook=$pgac_cv_check_docbook ...@@ -8534,7 +8567,7 @@ have_docbook=$pgac_cv_check_docbook
echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6 echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6
echo "configure:8538: checking for DocBook stylesheets" >&5 echo "configure:8571: checking for DocBook stylesheets" >&5
if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8573,7 +8606,7 @@ do ...@@ -8573,7 +8606,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:8577: checking for $ac_word" >&5 echo "configure:8610: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
......
configure.in
View file @ 379268aa
...@@ -985,6 +985,15 @@ if test x"$pgac_cv_var_int_optreset" = x"yes"; then ...@@ -985,6 +985,15 @@ if test x"$pgac_cv_var_int_optreset" = x"yes"; then
AC_DEFINE(HAVE_INT_OPTRESET, 1) AC_DEFINE(HAVE_INT_OPTRESET, 1)
fi fi
AC_CACHE_CHECK([for __getopt_initialized], pgac_cv_var_int___getopt_initialized,
[AC_TRY_LINK([#include <unistd.h>],
[extern int __getopt_initialized; __getopt_initialized = 1;],
[pgac_cv_var_int___getopt_initialized=yes],
[pgac_cv_var_int___getopt_initialized=no])])
if test x"$pgac_cv_var_int___getopt_initialized" = x"yes"; then
AC_DEFINE(HAVE_INT___GETOPT_INITIALIZED, 1)
fi
# This test makes sure that run tests work at all. Sometimes a shared # This test makes sure that run tests work at all. Sometimes a shared
# library is found by the linker, but the runtime linker can't find it. # library is found by the linker, but the runtime linker can't find it.
......
src/backend/postmaster/postmaster.c
View file @ 379268aa
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.248 2001/10/19 18:19:41 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.249 2001/10/19 20:47:09 tgl Exp $
* *
* NOTES * NOTES
* *
...@@ -228,6 +228,9 @@ extern int optind, ...@@ -228,6 +228,9 @@ extern int optind,
#ifdef HAVE_INT_OPTRESET #ifdef HAVE_INT_OPTRESET
extern int optreset; extern int optreset;
#endif #endif
#ifdef HAVE_INT___GETOPT_INITIALIZED
extern int __getopt_initialized;
#endif
/* /*
* postmaster.c - function prototypes * postmaster.c - function prototypes
...@@ -355,7 +358,6 @@ PostmasterMain(int argc, char *argv[]) ...@@ -355,7 +358,6 @@ PostmasterMain(int argc, char *argv[])
} }
} }
/* /*
* for security, no dir or file created can be group or other * for security, no dir or file created can be group or other
* accessible * accessible
...@@ -422,12 +424,13 @@ PostmasterMain(int argc, char *argv[]) ...@@ -422,12 +424,13 @@ PostmasterMain(int argc, char *argv[])
} }
/* /*
* Non-option switch arguments don't exist. * Postmaster accepts no non-option switch arguments.
*/ */
if (optind < argc) if (optind < argc)
{ {
postmaster_error("invalid argument -- %s", argv[optind]); postmaster_error("invalid argument -- %s", argv[optind]);
fprintf(stderr, gettext("Try '%s --help' for more information.\n"), progname); fprintf(stderr, gettext("Try '%s --help' for more information.\n"),
progname);
ExitPostmaster(1); ExitPostmaster(1);
} }
...@@ -438,10 +441,15 @@ PostmasterMain(int argc, char *argv[]) ...@@ -438,10 +441,15 @@ PostmasterMain(int argc, char *argv[])
IgnoreSystemIndexes(false); IgnoreSystemIndexes(false);
optind = 1; /* start over (should be redundant here) */ /* reset getopt(3) to rescan arguments */
optind = 1;
#ifdef HAVE_INT_OPTRESET #ifdef HAVE_INT_OPTRESET
optreset = 1; optreset = 1; /* some systems need this */
#endif
#ifdef HAVE_INT___GETOPT_INITIALIZED
__getopt_initialized = 0; /* glibc needs this */
#endif #endif
while ((opt = getopt(argc, argv, "A:a:B:b:c:D:d:Fh:ik:lm:MN:no:p:Ss-:")) != EOF) while ((opt = getopt(argc, argv, "A:a:B:b:c:D:d:Fh:ik:lm:MN:no:p:Ss-:")) != EOF)
{ {
switch (opt) switch (opt)
...@@ -584,6 +592,20 @@ PostmasterMain(int argc, char *argv[]) ...@@ -584,6 +592,20 @@ PostmasterMain(int argc, char *argv[])
ExitPostmaster(1); ExitPostmaster(1);
} }
/*
* Now that we are done processing the postmaster arguments,
* reset getopt(3) library so that it will work correctly in
* subprocesses.
*/
optind = 1;
#ifdef HAVE_INT_OPTRESET
optreset = 1; /* some systems need this */
#endif
#ifdef HAVE_INT___GETOPT_INITIALIZED
__getopt_initialized = 0; /* glibc needs this */
#endif
/* For debugging: display postmaster environment */
if (DebugLvl > 2) if (DebugLvl > 2)
{ {
extern char **environ; extern char **environ;
...@@ -2179,11 +2201,6 @@ DoBackend(Port *port) ...@@ -2179,11 +2201,6 @@ DoBackend(Port *port)
av[ac] = (char *) NULL; av[ac] = (char *) NULL;
optind = 1; /* reset getopt(3) for subprocess */
#ifdef HAVE_INT_OPTRESET
optreset = 1;
#endif
/* /*
* Release postmaster's working memory context so that backend can * Release postmaster's working memory context so that backend can
* recycle the space. Note this does not trash *MyProcPort, because * recycle the space. Note this does not trash *MyProcPort, because
...@@ -2473,11 +2490,6 @@ SSDataBase(int xlop) ...@@ -2473,11 +2490,6 @@ SSDataBase(int xlop)
av[ac] = (char *) NULL; av[ac] = (char *) NULL;
optind = 1; /* reset getopt(3) for subprocess */
#ifdef HAVE_INT_OPTRESET
optreset = 1;
#endif
BootstrapMain(ac, av); BootstrapMain(ac, av);
ExitPostmaster(0); ExitPostmaster(0);
} }
......
src/include/pg_config.h.in
View file @ 379268aa
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your * or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your
* changes will be overwritten the next time you run configure. * changes will be overwritten the next time you run configure.
* *
* $Id: pg_config.h.in,v 1.9 2001/10/13 04:23:50 momjian Exp $ * $Id: pg_config.h.in,v 1.10 2001/10/19 20:47:09 tgl Exp $
*/ */
#ifndef PG_CONFIG_H #ifndef PG_CONFIG_H
...@@ -667,6 +667,9 @@ extern int fdatasync(int fildes); ...@@ -667,6 +667,9 @@ extern int fdatasync(int fildes);
/* Define if you have the optreset variable */ /* Define if you have the optreset variable */
#undef HAVE_INT_OPTRESET #undef HAVE_INT_OPTRESET
/* Define if you have the __getopt_initialized variable */
#undef HAVE_INT___GETOPT_INITIALIZED
/* Define if you have strtoll() */ /* Define if you have strtoll() */
#undef HAVE_STRTOLL #undef HAVE_STRTOLL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment