summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2000-07-15 15:54:52 +0000
committerPeter Eisentraut2000-07-15 15:54:52 +0000
commit3eec6ee145976fe0fcecc0199e179d90178daa6d (patch)
tree94f8f2a8c705bff35bde81a55eeb7406be03deca
parent739a0566a639bc0e052447f09fafdb8f5bb37d9b (diff)
Rename templates to match names in makefiles/Makefile.* and include/port.
Read templates after compiler is detected. Convert all templates to real shell scripts. Rename bsd->openbsd, alpha->osf.
-rwxr-xr-xconfigure1272
-rw-r--r--configure.in468
-rw-r--r--src/include/port/openbsd.h (renamed from src/include/port/bsd.h)0
-rw-r--r--src/include/port/osf.h (renamed from src/include/port/alpha.h)0
-rw-r--r--src/makefiles/Makefile.openbsd (renamed from src/makefiles/Makefile.bsd)0
-rw-r--r--src/makefiles/Makefile.osf (renamed from src/makefiles/Makefile.alpha)0
-rw-r--r--src/template/.similar34
-rw-r--r--src/template/aix23
-rw-r--r--src/template/aix_3258
-rw-r--r--src/template/aix_418
-rw-r--r--src/template/aix_428
-rw-r--r--src/template/aix_gcc9
-rw-r--r--src/template/alpha_gcc14
-rw-r--r--src/template/bsdi22
-rw-r--r--src/template/bsdi_2.08
-rw-r--r--src/template/bsdi_2.18
-rw-r--r--src/template/bsdi_4.08
-rw-r--r--src/template/bsdi_4.0_sparc8
-rw-r--r--src/template/cygwin328
-rw-r--r--src/template/dgux12
-rw-r--r--src/template/freebsd10
-rw-r--r--src/template/generic7
-rw-r--r--src/template/hpux14
-rw-r--r--src/template/hpux_cc11
-rw-r--r--src/template/hpux_gcc10
-rw-r--r--src/template/irix511
-rw-r--r--src/template/linux9
-rw-r--r--src/template/linux_alpha9
-rw-r--r--src/template/linux_arm7
-rw-r--r--src/template/linux_i3867
-rw-r--r--src/template/linux_m68k7
-rw-r--r--src/template/linux_mips7
-rwxr-xr-xsrc/template/linux_ppc7
-rw-r--r--src/template/linux_sparc7
-rw-r--r--src/template/netbsd10
-rw-r--r--src/template/nextstep11
-rw-r--r--src/template/openbsd10
-rw-r--r--src/template/osf (renamed from src/template/alpha_cc)26
-rw-r--r--src/template/qnx9
-rw-r--r--src/template/qnx46
-rw-r--r--src/template/sco13
-rw-r--r--src/template/solaris_i38611
-rw-r--r--src/template/solaris_i386_cc8
-rw-r--r--src/template/solaris_i386_gcc7
-rw-r--r--src/template/solaris_sparc10
-rw-r--r--src/template/solaris_sparc_cc8
-rw-r--r--src/template/solaris_sparc_gcc7
-rw-r--r--src/template/sunos410
-rw-r--r--src/template/sunos4_cc8
-rw-r--r--src/template/sunos4_gcc7
-rw-r--r--src/template/svr411
-rw-r--r--src/template/ultrix411
-rw-r--r--src/template/univel13
-rw-r--r--src/template/unixware13
-rw-r--r--src/template/win6
55 files changed, 1036 insertions, 1220 deletions
diff --git a/configure b/configure
index 2b818bd854..aa73b3bed7 100755
--- a/configure
+++ b/configure
@@ -13,15 +13,11 @@ ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_default_prefix=/usr/local/pgsql
ac_help="$ac_help
- --with-template=TEMPLATE
- use operating system template file
- see template directory"
-ac_help="$ac_help
- --with-includes=DIRS add non-standard include paths"
+ --with-includes=DIRS look for additional header files in DIRS"
ac_help="$ac_help
--with-libraries=DIRS look for additional libraries in DIRS"
ac_help="$ac_help
- --with-libs=DIRS alternate spelling of --with-libraries"
+ --with-libs=DIRS alternative spelling of --with-libraries"
ac_help="$ac_help
--enable-locale enable locale support"
ac_help="$ac_help
@@ -33,6 +29,8 @@ ac_help="$ac_help
ac_help="$ac_help
--with-maxbackends=N set default maximum number of connections [32]"
ac_help="$ac_help
+ --enable-debug build with debugging symbols (-g)"
+ac_help="$ac_help
--with-tcl build Tcl interfaces and pgtclsh "
ac_help="$ac_help
--with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR"
@@ -59,8 +57,6 @@ ac_help="$ac_help
ac_help="$ac_help
--enable-cassert enable assertion checks (for debugging) "
ac_help="$ac_help
- --enable-debug build with debugging symbols (-g) "
-ac_help="$ac_help
--with-CXX build C++ modules (libpq++)"
ac_help="$ac_help
--enable-syslog enable logging to syslog"
@@ -614,7 +610,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:618: checking host system type" >&5
+echo "configure:614: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -635,173 +631,133 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
-tas_file=dummy.s
-case "$host_os" in
+template=
+echo $ac_n "checking which template to use""... $ac_c" 1>&6
+echo "configure:637: checking which template to use" >&5
+
+# check if --with-template was given
+if test x"${with_template+set}" = xset ; then
+ case $with_template in
+ yes|no) { echo "configure: error: You must supply an argument to the --with-template option." 1>&2; exit 1; };;
+ list) echo; ls "$srcdir/src/template"; exit;;
+ *) if test -f "$srcdir/src/template/$with_template" ; then
+ template=$with_template
+ else
+ { echo "configure: error: \`$with_template' is not a valid template name. Use \`list' for a list." 1>&2; exit 1; }
+ fi;;
+ esac
+
+else # --with-template not given
+
+case $host_os in
+ aix*) template=aix ;;
+ bsdi*) template=bsdi ;;
+ cygwin*) template=win ;;
+ dgux*) template=dgux ;;
+ freebsd*) template=freebsd ;;
+ hpux*) template=hpux ;;
+ irix*) template=irix5 ;;
+ linux*) template=linux ;;
+ netbsd*) template=netbsd ;;
+nextstep*) template=nextstep ;;
+ openbsd*) template=openbsd ;;
+ osf*) template=osf ;;
+ qnx*) template=qnx4 ;;
+ sco*) template=sco ;;
solaris*)
- case "$host_cpu" in
- sparc) os=solaris_sparc need_tas=yes tas_file=solaris_sparc.s ;;
- i386) os=solaris_i386 need_tas=yes tas_file=solaris_i386.s ;;
+ case $host_cpu in
+ sparc) template=solaris_sparc ;;
+ i?86) template=solaris_i386 ;;
esac ;;
- sunos*) os=sunos4 need_tas=no ;;
- beos) os=beos need_tas=no ;;
- aux*) os=aux need_tas=no ;;
- linux*) os=linux need_tas=no ;;
- bsdi*) os=bsdi need_tas=no ;;
- freebsd1*|freebsd2*) os=freebsd need_tas=no ;;
- freebsd*) os=freebsd need_tas=no elf=yes ;;
- netbsd*) os=netbsd need_tas=no ;;
- openbsd*) os=bsd need_tas=no ;;
- dgux*) os=dgux need_tas=no ;;
- aix*) os=aix need_tas=no ;;
-nextstep*) os=nextstep need_tas=no ;;
- ultrix*) os=ultrix4 need_tas=no ;;
- irix*) os=irix5 need_tas=no ;;
- hpux*) os=hpux need_tas=yes tas_file=hpux.s ;;
- osf*) os=alpha need_tas=no ;;
- sco*) os=sco need_tas=no ;;
- machten*) os=machten need_tas=no ;;
- cygwin*) os=win need_tas=no ;;
+ sunos*) template=sunos4 ;;
sysv4.2*)
- case "$host_vendor" in
- univel) os=univel need_tas=no ;;
- *) os=unknown need_tas=no ;;
- esac ;;
- sysv4*) os=svr4 need_tas=no ;;
- sysv5uw*) os=unixware need_tas=no ;;
- unixware*) os=unixware need_tas=no ;;
- qnx*) os=qnx4 need_tas=no ;;
-*) echo ""
- echo "*************************************************************"
- echo "configure does not currently recognize your operating system,"
- echo "therefore you must do a manual configuration of:"
- echo "$host_os"
- echo "Please contact [email protected] to see about rectifying this, "
- echo "including the above 'checking host system type...' line "
- echo "*************************************************************"
- echo ""
- exit;;
+ case $host_vendor in
+ univel) template=univel ;;
+ esac ;;
+ sysv4*) template=svr4 ;;
+ sysv5uw*) template=unixware ;;
+ ultrix*) template=ultrix4 ;;
esac
-PORTNAME=${os}
-CPU=${host_cpu}
+ if test x"$template" = x"" ; then
+ { echo "configure: error:
+*******************************************************************
+PostgreSQL has apparently not been ported to your platform yet.
+To try a manual configuration, look info the src/template directory
+for a similar platform and use the \`--with-template=' option.
+
+Please also contact <[email protected]> to see about
+rectifying this. Include the above \`checking host system type...'
+line.
+*******************************************************************
+" 1>&2; exit 1; }
+ fi
+fi # --with-template not given
+echo "$ac_t""$template" 1>&6
+PORTNAME=$template
+CPU=$host_cpu
-if test "X$need_tas" = "Xyes"
-then
-
- TAS=tas.o
-
-fi
-echo $ac_n "checking setting template to""... $ac_c" 1>&6
-echo "configure:702: checking setting template to" >&5
-# Check whether --with-template or --without-template was given.
-if test "${with_template+set}" = set; then
- withval="$with_template"
- TEMPLATE=$withval
-else
-
-# lowercase $host
-host="`echo $host | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`"
-
-# First, try for a template exactly matching $host
-if test -f "src/template/$host"
-then TEMPLATE="$host"
-else
- # Scan template/.similar for a rule that tells us which template to use.
- # The format of each line of the file is
- # hostnamepattern=templatefilename
- # where the hostnamepattern is evaluated per the rules of expr(1) ---
- # namely, it is a standard regular expression with an implicit ^ at the
- # start. If multiple lines match, we will end up using the last match.
- #
- # The tempfile hackery is needed because some shells will run the loop
- # inside a subshell, whereupon shell variables set therein aren't seen
- # outside the loop :-(
- TMPFILE="guesses.$$"
- cat /dev/null > $TMPFILE
- while read LINE
- do
- SIMHOST=`expr "$LINE" : '\(.*\)='`
- MATCH=`expr "$host" : "$SIMHOST"`
- if test "$MATCH" != 0
- then
- echo "$LINE" | sed 's/^.*=//' > $TMPFILE
- fi
- done <src/template/.similar
- GUESS=`cat $TMPFILE`
- rm -f $TMPFILE
- if test "$GUESS"
- then TEMPLATE="$GUESS"
- else
- # Last chance ... maybe uname -s will match an entry.
- TEMPLATE=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- fi
-fi
-
-fi
-echo "$ac_t""$TEMPLATE" 1>&6
-export TEMPLATE
-if test ! -f "src/template/$TEMPLATE"; then
- echo ""
- echo "$TEMPLATE does not exist"
- echo ""
- echo "Available Templates (select one using --with-template):"
- echo ""
- ls src/template
- echo ""
- exit
+
+# Pick right test-and-set (TAS) code. Most platforms have inline
+# assembler code in their port include file, so we just use a dummy
+# file here.
+tas_file=dummy.s
+need_tas=no
+case $template in
+ hpux) need_tas=yes; tas_file=hpux.s ;;
+ solaris_sparc) need_tas=yes; tas_file=solaris_sparc.s ;;
+ solaris_i386) need_tas=yes; tas_file=solaris_i386.s ;;
+esac
+
+if test "$need_tas" = yes ; then
+
+ TAS=tas.o
fi
-rm -f conftest.sh
-sed 's/^\([A-Za-z_]*\):\(.*\)$/\1="\2"/' "src/template/$TEMPLATE" >conftest.sh
-. ./conftest.sh
-rm -f conftest.sh
+
+##
+## Command line options
+##
+#
+# Add non-standard directories to the include path
+#
# Check whether --with-includes or --without-includes was given.
if test "${with_includes+set}" = set; then
withval="$with_includes"
- if test x"$withval" = x"yes" || test x"$withval" = x"no" ; then
- { echo "configure: error: You must supply an argument to the --with-includes option." 1>&2; exit 1; }
-fi
-fi
-
+
+ case $withval in
+ yes | no) { echo "configure: error: You must supply an argument to the --with-includes option." 1>&2; exit 1; };;
+ esac
-# SRCH_INC comes from the template file
-ac_save_IFS=$IFS
-IFS=':'
-for dir in $with_includes $SRCH_INC; do
- if test -d "$dir"; then
- INCLUDES="$INCLUDES -I$dir"
- else
- echo "configure: warning: *** Include directory $dir does not exist." 1>&2
- fi
-done
-IFS=$ac_save_IFS
+fi
+#
+# Add non-standard directories to the library search path
+#
# Check whether --with-libraries or --without-libraries was given.
if test "${with_libraries+set}" = set; then
withval="$with_libraries"
- case "$withval" in
- "" | y | ye | yes | n | no)
- { echo "configure: error: *** You must supply an argument to the --with-libraries option." 1>&2; exit 1; }
- ;;
- esac
- LIBRARY_DIRS="$withval"
-
+ case $withval in
+ yes | no) { echo "configure: error: You must supply an argument to the --with-libraries option." 1>&2; exit 1; };;
+ esac
+ LIBRARY_DIRS=$withval
+
fi
@@ -809,43 +765,27 @@ fi
if test "${with_libs+set}" = set; then
withval="$with_libs"
- case "$withval" in
- "" | y | ye | yes | n | no)
- { echo "configure: error: *** You must supply an argument to the --with-libs option." 1>&2; exit 1; }
- ;;
- esac
- LIBRARY_DIRS="$withval"
-
-fi
-
+ case $withval in
+ yes | no) { echo "configure: error: You must supply an argument to the --with-libs option." 1>&2; exit 1; };;
+ esac
+ LIBRARY_DIRS=$withval
-if test "$LIBRARY_DIRS" -o "$SRCH_LIB"; then
- for dir in $LIBRARY_DIRS $SRCH_LIB; do
- if test -d "$dir"; then
- PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"
- else
- echo "configure: warning: *** Library directory $dir does not exist." 1>&2
- fi
- done
fi
-##
-## Command line options
-##
#
# Locale (--enable-locale)
#
echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6
-echo "configure:842: checking whether to build with locale support" >&5
+echo "configure:782: checking whether to build with locale support" >&5
# Check whether --enable-locale or --disable-locale was given.
if test "${enable_locale+set}" = set; then
enableval="$enable_locale"
if test x"$enable_locale" != x"no" ; then
enable_locale=yes
cat >> confdefs.h <<\EOF
-#define USE_LOCALE
+#define USE_LOCALE 1
EOF
fi
@@ -860,14 +800,14 @@ echo "$ac_t""$enable_locale" 1>&6
# Cyrillic recode (--enable-recode)
#
echo $ac_n "checking whether to build with Cyrillic recode support""... $ac_c" 1>&6
-echo "configure:864: checking whether to build with Cyrillic recode support" >&5
+echo "configure:804: checking whether to build with Cyrillic recode support" >&5
# Check whether --enable-recode or --disable-recode was given.
if test "${enable_recode+set}" = set; then
enableval="$enable_recode"
if test x"$enable_recode" != x"no" ; then
enable_recode=yes
cat >> confdefs.h <<\EOF
-#define CYR_RECODE
+#define CYR_RECODE 1
EOF
fi
@@ -883,7 +823,7 @@ echo "$ac_t""$enable_recode" 1>&6
#
MULTIBYTE=
echo $ac_n "checking whether to build with multibyte character support""... $ac_c" 1>&6
-echo "configure:887: checking whether to build with multibyte character support" >&5
+echo "configure:827: checking whether to build with multibyte character support" >&5
# Check whether --enable-multibyte or --disable-multibyte was given.
if test "${enable_multibyte+set}" = set; then
enableval="$enable_multibyte"
@@ -910,7 +850,7 @@ fi
if test "$enable_multibyte" = yes ; then
cat >> confdefs.h <<\EOF
-#define MULTIBYTE
+#define MULTIBYTE 1
EOF
echo "$ac_t""yes, default $MULTIBYTE" 1>&6
@@ -923,7 +863,7 @@ fi
# Default port number (--with-pgport), default 5432
#
echo $ac_n "checking for default port number""... $ac_c" 1>&6
-echo "configure:927: checking for default port number" >&5
+echo "configure:867: checking for default port number" >&5
# Check whether --with-pgport or --without-pgport was given.
if test "${with_pgport+set}" = set; then
withval="$with_pgport"
@@ -952,7 +892,7 @@ echo "$ac_t""$default_port" 1>&6
# Maximum number of allowed connections (--with-maxbackends), default 32
#
echo $ac_n "checking for default soft limit on number of connections""... $ac_c" 1>&6
-echo "configure:956: checking for default soft limit on number of connections" >&5
+echo "configure:896: checking for default soft limit on number of connections" >&5
# Check whether --with-maxbackends or --without-maxbackends was given.
if test "${with_maxbackends+set}" = set; then
withval="$with_maxbackends"
@@ -971,10 +911,12 @@ EOF
#
+# C compiler
+#
+
# For historical reasons you can also use --with-CC to specify the C compiler
# to use, although the standard way to do this is to set the CC environment
# variable.
-#
if test "${with_CC+set}" = set; then
case $with_CC in
yes | no) { echo "configure: error: You must supply an argument to the --with-CC option." 1>&2; exit 1; };;
@@ -982,14 +924,13 @@ if test "${with_CC+set}" = set; then
esac
fi
+# On AIX, default compiler to xlc.
+if test "$template" = aix && test -z "$CC" ; then CC=xlc; fi
-#
-# C compiler
-#
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:993: checking for $ac_word" >&5
+echo "configure:934: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1019,7 +960,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1023: checking for $ac_word" >&5
+echo "configure:964: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1070,7 +1011,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1074: checking for $ac_word" >&5
+echo "configure:1015: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1102,7 +1043,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1106: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1047: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1113,12 +1054,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 1117 "configure"
+#line 1058 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1144,12 +1085,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1148: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1089: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1153: checking whether we are using GNU C" >&5
+echo "configure:1094: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1158,7 +1099,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -1177,7 +1118,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1181: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1122: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1208,8 +1149,59 @@ else
fi
fi
+# Read the template
+. "$srcdir/src/template/$template" || exit
+echo "using CFLAGS=$CFLAGS"
+# Check if the compiler still works with the template settings
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:1158: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 1169 "configure"
+#include "confdefs.h"
+
+main(){return(0);}
+EOF
+if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cc_works=yes
+ # If we can't run a trivial program, we are probably using a cross compiler.
+ if (./conftest; exit) 2>/dev/null; then
+ ac_cv_prog_cc_cross=no
+ else
+ ac_cv_prog_cc_cross=yes
+ fi
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+if test $ac_cv_prog_cc_works = no; then
+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:1200: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
+
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1213: checking how to run the C preprocessor" >&5
+echo "configure:1205: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1224,13 +1216,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1228 "configure"
+#line 1220 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1226: \"$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
:
@@ -1241,13 +1233,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1245 "configure"
+#line 1237 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1243: \"$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
:
@@ -1258,13 +1250,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1262 "configure"
+#line 1254 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1260: \"$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
:
@@ -1290,13 +1282,13 @@ echo "$ac_t""$CPP" 1>&6
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:1294: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:1286: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 1300 "configure"
+#line 1292 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -1314,7 +1306,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 1318 "configure"
+#line 1310 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -1337,9 +1329,12 @@ fi
-#
+
+
+
+
+
# Create compiler version string
-#
if test x"$GCC" = x"yes" ; then
cc_string="GCC `${CC} --version`"
else
@@ -1351,9 +1346,65 @@ EOF
+# --enable-debug adds -g to compiler flags
+# --disable-debug will forcefully remove it
+echo $ac_n "checking setting debug compiler flag""... $ac_c" 1>&6
+echo "configure:1353: checking setting debug compiler flag" >&5
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+ enableval="$enable_debug"
+
+ case $enableval in
+ yes) CFLAGS="$CFLAGS -g"
+ echo "$ac_t""yes" 1>&6
+ ;;
+ *) CFLAGS=`echo "$CFLAGS" | sed -e 's/ -g/ /g' -e 's/^-g//'`
+ echo "$ac_t""no" 1>&6
+ ;;
+ esac
+
+else
+ echo "$ac_t""using default" 1>&6
+fi
+
+
+
+#
+# Include directories
+#
+ac_save_IFS=$IFS
+IFS=':'
+# SRCH_INC comes from the template file
+for dir in $with_includes $SRCH_INC; do
+ if test -d "$dir"; then
+ INCLUDES="$INCLUDES -I$dir"
+ else
+ echo "configure: warning: *** Include directory $dir does not exist." 1>&2
+ fi
+done
+IFS=$ac_save_IFS
+
+
+
+#
+# Library directories
+#
+ac_save_IFS=$IFS
+IFS=':'
+# LIBRARY_DIRS comes from command line, SRCH_LIB from template file.
+for dir in $LIBRARY_DIRS $SRCH_LIB; do
+ if test -d "$dir"; then
+ PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"
+ else
+ echo "configure: warning: *** Library directory $dir does not exist." 1>&2
+ fi
+done
+IFS=$ac_save_IFS
+
+
echo $ac_n "checking setting USE_TCL""... $ac_c" 1>&6
-echo "configure:1357: checking setting USE_TCL" >&5
+echo "configure:1408: checking setting USE_TCL" >&5
# Check whether --with-tcl or --without-tcl was given.
if test "${with_tcl+set}" = set; then
withval="$with_tcl"
@@ -1369,8 +1420,8 @@ else
fi
-export USE_TCL
-export USE_TK
+
+
# Check whether --with-tclconfig or --without-tclconfig was given.
@@ -1406,7 +1457,7 @@ fi
echo $ac_n "checking whether to build Perl modules""... $ac_c" 1>&6
-echo "configure:1410: checking whether to build Perl modules" >&5
+echo "configure:1461: checking whether to build Perl modules" >&5
# Check whether --with-perl or --without-perl was given.
if test "${with_perl+set}" = set; then
withval="$with_perl"
@@ -1423,7 +1474,7 @@ fi
echo $ac_n "checking whether to build Python modules""... $ac_c" 1>&6
-echo "configure:1427: checking whether to build Python modules" >&5
+echo "configure:1478: checking whether to build Python modules" >&5
# Check whether --with-python or --without-python was given.
if test "${with_python+set}" = set; then
withval="$with_python"
@@ -1432,7 +1483,7 @@ if test "${with_python+set}" = set; then
# Extract the first word of "python", so it can be a program name with args.
set dummy python; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1436: checking for $ac_word" >&5
+echo "configure:1487: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_PYTHON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1468,7 +1519,7 @@ if test "${PYTHON+set}" = set ; then
python_extmakefile="${python_configdir}/Makefile.pre.in"
echo $ac_n "checking for Python extension makefile""... $ac_c" 1>&6
-echo "configure:1472: checking for Python extension makefile" >&5
+echo "configure:1523: checking for Python extension makefile" >&5
if test -f "${python_extmakefile}" ; then
echo "$ac_t""found" 1>&6
else
@@ -1683,7 +1734,7 @@ if test "x${with_odbc+set}" = xset && test "x${enable_odbc+set}" != xset; then
fi
echo $ac_n "checking whether to build the ODBC driver""... $ac_c" 1>&6
-echo "configure:1687: checking whether to build the ODBC driver" >&5
+echo "configure:1738: checking whether to build the ODBC driver" >&5
# Check whether --enable-odbc or --disable-odbc was given.
if test "${enable_odbc+set}" = set; then
enableval="$enable_odbc"
@@ -1719,7 +1770,7 @@ fi
echo $ac_n "checking setting ASSERT CHECKING""... $ac_c" 1>&6
-echo "configure:1723: checking setting ASSERT CHECKING" >&5
+echo "configure:1774: checking setting ASSERT CHECKING" >&5
# Check whether --enable-cassert or --disable-cassert was given.
if test "${enable_cassert+set}" = set; then
enableval="$enable_cassert"
@@ -1733,39 +1784,15 @@ else
fi
-CPPFLAGS="$CPPFLAGS $INCLUDES"
-echo "- setting CPPFLAGS=$CPPFLAGS"
-
-LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
-echo "- setting LDFLAGS=$LDFLAGS"
-
-echo $ac_n "checking setting debug compiler flag""... $ac_c" 1>&6
-echo "configure:1744: checking setting debug compiler flag" >&5
-# Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
- enableval="$enable_debug"
-
- case "$enableval" in
- y | ye | yes)
- CFLAGS="$CFLAGS -g"
- echo "$ac_t""enabled" 1>&6
- ;;
- *)
- CFLAGS=`echo "$CFLAGS" | sed -e 's/ -g/ /g' | sed -e 's/^-g//'`
- echo "$ac_t""disabled" 1>&6
- ;;
- esac
-
-else
- echo "$ac_t""using default" 1>&6
-
-fi
-
# Assume system is ELF if it predefines __ELF__ as 1,
-# otherwise believe "elf" setting from check of host_os above.
+# otherwise believe host_os based default.
+case $host_os in
+ freebsd1*|freebsd2*) elf=yes;;
+esac
+
cat > conftest.$ac_ext <<EOF
-#line 1769 "configure"
+#line 1796 "configure"
#include "confdefs.h"
#if __ELF__
yes
@@ -1778,13 +1805,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
ELF_SYS=true
else
rm -rf conftest*
- if test "X$elf" = "Xyes"
-then
- ELF_SYS=true
+ if test "X$elf" = "Xyes" ; then
+ ELF_SYS=true
else
- ELF_SYS=
+ ELF_SYS=
fi
-
fi
rm -f conftest*
@@ -1792,20 +1817,8 @@ rm -f conftest*
-
-
-
-
-
-
-
-
-
-
-
-
echo $ac_n "checking whether to build C++ modules""... $ac_c" 1>&6
-echo "configure:1809: checking whether to build C++ modules" >&5
+echo "configure:1822: checking whether to build C++ modules" >&5
# Check whether --with-CXX or --without-CXX was given.
if test "${with_CXX+set}" = set; then
withval="$with_CXX"
@@ -1819,7 +1832,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1823: checking for $ac_word" >&5
+echo "configure:1836: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1851,7 +1864,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1855: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1868: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1862,12 +1875,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 1866 "configure"
+#line 1879 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:1871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1893,12 +1906,12 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1897: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1910: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1902: checking whether we are using GNU C++" >&5
+echo "configure:1915: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1907,7 +1920,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -1926,7 +1939,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1930: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1943: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1958,7 +1971,7 @@ else
fi
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1962: checking how to run the C++ preprocessor" >&5
+echo "configure:1975: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1971,12 +1984,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 1975 "configure"
+#line 1988 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1993: \"$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
:
@@ -2010,17 +2023,17 @@ cross_compiling=$ac_cv_prog_cxx_cross
ac_safe=`echo "string" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for string""... $ac_c" 1>&6
-echo "configure:2014: checking for string" >&5
+echo "configure:2027: checking for string" >&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 2019 "configure"
+#line 2032 "configure"
#include "confdefs.h"
#include <string>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2037: \"$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*
@@ -2047,12 +2060,12 @@ fi
if test x"$ac_cv_header_string" != xyes ; then
echo $ac_n "checking for class string in <string.h>""... $ac_c" 1>&6
-echo "configure:2051: checking for class string in <string.h>" >&5
+echo "configure:2064: checking for class string in <string.h>" >&5
if eval "test \"`echo '$''{'pgac_cv_class_string_in_string_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2056 "configure"
+#line 2069 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -2062,7 +2075,7 @@ int main() {
string foo = "test"
; return 0; }
EOF
-if { (eval echo configure:2066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_class_string_in_string_h=yes
else
@@ -2089,7 +2102,7 @@ cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for namespace std in C++""... $ac_c" 1>&6
-echo "configure:2093: checking for namespace std in C++" >&5
+echo "configure:2106: checking for namespace std in C++" >&5
if eval "test \"`echo '$''{'pgac_cv_cxx_namespace_std'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2103,7 +2116,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
-#line 2107 "configure"
+#line 2120 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -2116,7 +2129,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_cxx_namespace_std=yes
else
@@ -2153,6 +2166,13 @@ fi
+CPPFLAGS="$CPPFLAGS $INCLUDES"
+LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
+
+echo "using CPPFLAGS=$CPPFLAGS"
+echo "using LDFLAGS=$LDFLAGS"
+
+
# Figure out how to invoke "install" and what install options to use.
# Find a good install program. We prefer a C program (faster),
@@ -2167,7 +2187,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2171: checking for a BSD compatible install" >&5
+echo "configure:2191: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2249,7 +2269,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2253: checking for $ac_word" >&5
+echo "configure:2273: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2282,7 +2302,7 @@ done
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2286: checking for $ac_word" >&5
+echo "configure:2306: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2316,7 +2336,7 @@ then
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:2320: checking for yywrap in -l$ac_lib" >&5
+echo "configure:2340: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2324,7 +2344,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2328 "configure"
+#line 2348 "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
@@ -2335,7 +2355,7 @@ int main() {
yywrap()
; return 0; }
EOF
-if { (eval echo configure:2339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2359: \"$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
@@ -2372,7 +2392,7 @@ broken as well.)
fi
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2376: checking whether ln -s works" >&5
+echo "configure:2396: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2395,7 +2415,7 @@ fi
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2399: checking for $ac_word" >&5
+echo "configure:2419: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2425,7 +2445,7 @@ fi
# Extract the first word of "tar", so it can be a program name with args.
set dummy tar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2429: checking for $ac_word" >&5
+echo "configure:2449: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_tar'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2462,7 +2482,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2466: checking for $ac_word" >&5
+echo "configure:2486: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2496,7 +2516,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2500: checking for $ac_word" >&5
+echo "configure:2520: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2534,7 +2554,7 @@ test -n "$YACC" || YACC="yacc"
##
echo $ac_n "checking for main in -lsfio""... $ac_c" 1>&6
-echo "configure:2538: checking for main in -lsfio" >&5
+echo "configure:2558: checking for main in -lsfio" >&5
ac_lib_var=`echo sfio'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2542,14 +2562,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsfio $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2546 "configure"
+#line 2566 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2573: \"$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
@@ -2577,7 +2597,7 @@ else
fi
echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6
-echo "configure:2581: checking for main in -lncurses" >&5
+echo "configure:2601: checking for main in -lncurses" >&5
ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2585,14 +2605,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2589 "configure"
+#line 2609 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2616: \"$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
@@ -2618,7 +2638,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
-echo "configure:2622: checking for main in -lcurses" >&5
+echo "configure:2642: checking for main in -lcurses" >&5
ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2626,14 +2646,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2630 "configure"
+#line 2650 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2657: \"$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
@@ -2663,7 +2683,7 @@ fi
fi
echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
-echo "configure:2667: checking for main in -ltermcap" >&5
+echo "configure:2687: checking for main in -ltermcap" >&5
ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2671,14 +2691,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2675 "configure"
+#line 2695 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2702: \"$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
@@ -2706,7 +2726,7 @@ else
fi
echo $ac_n "checking for main in -lreadline""... $ac_c" 1>&6
-echo "configure:2710: checking for main in -lreadline" >&5
+echo "configure:2730: checking for main in -lreadline" >&5
ac_lib_var=`echo readline'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2714,14 +2734,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2718 "configure"
+#line 2738 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2745: \"$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
@@ -2749,7 +2769,7 @@ else
fi
echo $ac_n "checking for using_history in -lreadline""... $ac_c" 1>&6
-echo "configure:2753: checking for using_history in -lreadline" >&5
+echo "configure:2773: checking for using_history in -lreadline" >&5
ac_lib_var=`echo readline'_'using_history | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2757,7 +2777,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2761 "configure"
+#line 2781 "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
@@ -2768,7 +2788,7 @@ int main() {
using_history()
; return 0; }
EOF
-if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2792: \"$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
@@ -2790,7 +2810,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lhistory""... $ac_c" 1>&6
-echo "configure:2794: checking for main in -lhistory" >&5
+echo "configure:2814: checking for main in -lhistory" >&5
ac_lib_var=`echo history'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2798,14 +2818,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lhistory $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2802 "configure"
+#line 2822 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2829: \"$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
@@ -2838,7 +2858,7 @@ fi
if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
then
echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
-echo "configure:2842: checking for main in -lbsd" >&5
+echo "configure:2862: checking for main in -lbsd" >&5
ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2846,14 +2866,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2850 "configure"
+#line 2870 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2877: \"$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
@@ -2882,7 +2902,7 @@ fi
fi
echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6
-echo "configure:2886: checking for setproctitle in -lutil" >&5
+echo "configure:2906: checking for setproctitle in -lutil" >&5
ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2890,7 +2910,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2894 "configure"
+#line 2914 "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
@@ -2901,7 +2921,7 @@ int main() {
setproctitle()
; return 0; }
EOF
-if { (eval echo configure:2905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2925: \"$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
@@ -2929,7 +2949,7 @@ else
fi
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:2933: checking for main in -lm" >&5
+echo "configure:2953: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2937,14 +2957,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2941 "configure"
+#line 2961 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2968: \"$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
@@ -2972,7 +2992,7 @@ else
fi
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
-echo "configure:2976: checking for main in -ldl" >&5
+echo "configure:2996: checking for main in -ldl" >&5
ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2980,14 +3000,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2984 "configure"
+#line 3004 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3011: \"$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
@@ -3015,7 +3035,7 @@ else
fi
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:3019: checking for main in -lsocket" >&5
+echo "configure:3039: checking for main in -lsocket" >&5
ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3023,14 +3043,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3027 "configure"
+#line 3047 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3054: \"$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
@@ -3058,7 +3078,7 @@ else
fi
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:3062: checking for main in -lnsl" >&5
+echo "configure:3082: checking for main in -lnsl" >&5
ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3066,14 +3086,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3070 "configure"
+#line 3090 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3097: \"$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
@@ -3101,7 +3121,7 @@ else
fi
echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6
-echo "configure:3105: checking for main in -lipc" >&5
+echo "configure:3125: checking for main in -lipc" >&5
ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3109,14 +3129,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3113 "configure"
+#line 3133 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3140: \"$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
@@ -3144,7 +3164,7 @@ else
fi
echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6
-echo "configure:3148: checking for main in -lIPC" >&5
+echo "configure:3168: checking for main in -lIPC" >&5
ac_lib_var=`echo IPC'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3152,14 +3172,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lIPC $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3156 "configure"
+#line 3176 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3183: \"$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
@@ -3187,7 +3207,7 @@ else
fi
echo $ac_n "checking for main in -llc""... $ac_c" 1>&6
-echo "configure:3191: checking for main in -llc" >&5
+echo "configure:3211: checking for main in -llc" >&5
ac_lib_var=`echo lc'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3195,14 +3215,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-llc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3199 "configure"
+#line 3219 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3226: \"$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
@@ -3230,7 +3250,7 @@ else
fi
echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6
-echo "configure:3234: checking for main in -ldld" >&5
+echo "configure:3254: checking for main in -ldld" >&5
ac_lib_var=`echo dld'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3238,14 +3258,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3242 "configure"
+#line 3262 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3269: \"$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
@@ -3273,7 +3293,7 @@ else
fi
echo $ac_n "checking for main in -lln""... $ac_c" 1>&6
-echo "configure:3277: checking for main in -lln" >&5
+echo "configure:3297: checking for main in -lln" >&5
ac_lib_var=`echo ln'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3281,14 +3301,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lln $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3285 "configure"
+#line 3305 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3312: \"$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
@@ -3316,7 +3336,7 @@ else
fi
echo $ac_n "checking for main in -lld""... $ac_c" 1>&6
-echo "configure:3320: checking for main in -lld" >&5
+echo "configure:3340: checking for main in -lld" >&5
ac_lib_var=`echo ld'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3324,14 +3344,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3328 "configure"
+#line 3348 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3355: \"$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
@@ -3359,7 +3379,7 @@ else
fi
echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6
-echo "configure:3363: checking for main in -lcompat" >&5
+echo "configure:3383: checking for main in -lcompat" >&5
ac_lib_var=`echo compat'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3367,14 +3387,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcompat $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3371 "configure"
+#line 3391 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3398: \"$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
@@ -3402,7 +3422,7 @@ else
fi
echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6
-echo "configure:3406: checking for main in -lBSD" >&5
+echo "configure:3426: checking for main in -lBSD" >&5
ac_lib_var=`echo BSD'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3410,14 +3430,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lBSD $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3414 "configure"
+#line 3434 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3441: \"$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
@@ -3445,7 +3465,7 @@ else
fi
echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6
-echo "configure:3449: checking for main in -lgen" >&5
+echo "configure:3469: checking for main in -lgen" >&5
ac_lib_var=`echo gen'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3453,14 +3473,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgen $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3457 "configure"
+#line 3477 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3484: \"$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
@@ -3488,7 +3508,7 @@ else
fi
echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6
-echo "configure:3492: checking for main in -lPW" >&5
+echo "configure:3512: checking for main in -lPW" >&5
ac_lib_var=`echo PW'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3496,14 +3516,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lPW $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3500 "configure"
+#line 3520 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3527: \"$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
@@ -3532,14 +3552,14 @@ fi
echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6
-echo "configure:3536: checking for library containing crypt" >&5
+echo "configure:3556: checking for library containing crypt" >&5
if eval "test \"`echo '$''{'ac_cv_search_crypt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_func_search_save_LIBS="$LIBS"
ac_cv_search_crypt="no"
cat > conftest.$ac_ext <<EOF
-#line 3543 "configure"
+#line 3563 "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
@@ -3550,7 +3570,7 @@ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:3554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_crypt="none required"
else
@@ -3561,7 +3581,7 @@ rm -f conftest*
test "$ac_cv_search_crypt" = "no" && for i in crypt; do
LIBS="-l$i $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3565 "configure"
+#line 3585 "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
@@ -3572,7 +3592,7 @@ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_crypt="-l$i"
break
@@ -3593,7 +3613,7 @@ else :
fi
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:3597: checking for inflate in -lz" >&5
+echo "configure:3617: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3601,7 +3621,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3605 "configure"
+#line 3625 "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
@@ -3612,7 +3632,7 @@ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:3616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3636: \"$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
@@ -3642,7 +3662,7 @@ fi
if test "$with_krb4" = yes ; then
echo $ac_n "checking for des_encrypt in -ldes""... $ac_c" 1>&6
-echo "configure:3646: checking for des_encrypt in -ldes" >&5
+echo "configure:3666: checking for des_encrypt in -ldes" >&5
ac_lib_var=`echo des'_'des_encrypt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3650,7 +3670,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldes $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3654 "configure"
+#line 3674 "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
@@ -3661,7 +3681,7 @@ int main() {
des_encrypt()
; return 0; }
EOF
-if { (eval echo configure:3665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3685: \"$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
@@ -3690,7 +3710,7 @@ else
fi
echo $ac_n "checking for krb_sendauth in -lkrb""... $ac_c" 1>&6
-echo "configure:3694: checking for krb_sendauth in -lkrb" >&5
+echo "configure:3714: checking for krb_sendauth in -lkrb" >&5
ac_lib_var=`echo krb'_'krb_sendauth | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3698,7 +3718,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lkrb $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3702 "configure"
+#line 3722 "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
@@ -3709,7 +3729,7 @@ int main() {
krb_sendauth()
; return 0; }
EOF
-if { (eval echo configure:3713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3733: \"$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
@@ -3741,7 +3761,7 @@ fi
if test "$with_krb5" = yes ; then
echo $ac_n "checking for main in -lcom_err""... $ac_c" 1>&6
-echo "configure:3745: checking for main in -lcom_err" >&5
+echo "configure:3765: checking for main in -lcom_err" >&5
ac_lib_var=`echo com_err'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3749,14 +3769,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcom_err $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3753 "configure"
+#line 3773 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3780: \"$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
@@ -3785,7 +3805,7 @@ else
fi
echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6
-echo "configure:3789: checking for main in -lcrypto" >&5
+echo "configure:3809: checking for main in -lcrypto" >&5
ac_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3793,14 +3813,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3797 "configure"
+#line 3817 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3824: \"$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
@@ -3829,7 +3849,7 @@ else
fi
echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6
-echo "configure:3833: checking for main in -lkrb5" >&5
+echo "configure:3853: checking for main in -lkrb5" >&5
ac_lib_var=`echo krb5'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3837,14 +3857,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lkrb5 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3841 "configure"
+#line 3861 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3868: \"$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
@@ -3876,7 +3896,7 @@ fi
if test "$with_openssl" = yes ; then
echo $ac_n "checking for CRYPTO_new_ex_data in -lcrypto""... $ac_c" 1>&6
-echo "configure:3880: checking for CRYPTO_new_ex_data in -lcrypto" >&5
+echo "configure:3900: checking for CRYPTO_new_ex_data in -lcrypto" >&5
ac_lib_var=`echo crypto'_'CRYPTO_new_ex_data | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3884,7 +3904,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3888 "configure"
+#line 3908 "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
@@ -3895,7 +3915,7 @@ int main() {
CRYPTO_new_ex_data()
; return 0; }
EOF
-if { (eval echo configure:3899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3919: \"$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
@@ -3924,7 +3944,7 @@ else
fi
echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6
-echo "configure:3928: checking for SSL_library_init in -lssl" >&5
+echo "configure:3948: checking for SSL_library_init in -lssl" >&5
ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3932,7 +3952,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lssl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3936 "configure"
+#line 3956 "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
@@ -3943,7 +3963,7 @@ int main() {
SSL_library_init()
; return 0; }
EOF
-if { (eval echo configure:3947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3967: \"$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
@@ -3981,17 +4001,17 @@ for ac_hdr in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/psta
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3985: checking for $ac_hdr" >&5
+echo "configure:4005: 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 3990 "configure"
+#line 4010 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4015: \"$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*
@@ -4022,17 +4042,17 @@ for ac_hdr in readline/readline.h readline.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4026: checking for $ac_hdr" >&5
+echo "configure:4046: 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 4031 "configure"
+#line 4051 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4056: \"$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*
@@ -4062,17 +4082,17 @@ for ac_hdr in readline/history.h history.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4066: checking for $ac_hdr" >&5
+echo "configure:4086: 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 4071 "configure"
+#line 4091 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4096: \"$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*
@@ -4102,17 +4122,17 @@ done
if test "$with_krb4" = yes ; then
ac_safe=`echo "krb.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for krb.h""... $ac_c" 1>&6
-echo "configure:4106: checking for krb.h" >&5
+echo "configure:4126: checking for krb.h" >&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 4111 "configure"
+#line 4131 "configure"
#include "confdefs.h"
#include <krb.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4136: \"$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*
@@ -4139,17 +4159,17 @@ fi
if test "$with_krb5" = yes ; then
ac_safe=`echo "krb5.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for krb5.h""... $ac_c" 1>&6
-echo "configure:4143: checking for krb5.h" >&5
+echo "configure:4163: checking for krb5.h" >&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 4148 "configure"
+#line 4168 "configure"
#include "confdefs.h"
#include <krb5.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4173: \"$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*
@@ -4173,17 +4193,17 @@ fi
ac_safe=`echo "com_err.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for com_err.h""... $ac_c" 1>&6
-echo "configure:4177: checking for com_err.h" >&5
+echo "configure:4197: checking for com_err.h" >&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 4182 "configure"
+#line 4202 "configure"
#include "confdefs.h"
#include <com_err.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4207: \"$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*
@@ -4210,17 +4230,17 @@ fi
if test "$with_openssl" = yes ; then
ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6
-echo "configure:4214: checking for openssl/ssl.h" >&5
+echo "configure:4234: checking for openssl/ssl.h" >&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 4219 "configure"
+#line 4239 "configure"
#include "confdefs.h"
#include <openssl/ssl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4244: \"$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*
@@ -4244,17 +4264,17 @@ fi
ac_safe=`echo "openssl/err.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for openssl/err.h""... $ac_c" 1>&6
-echo "configure:4248: checking for openssl/err.h" >&5
+echo "configure:4268: checking for openssl/err.h" >&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 4253 "configure"
+#line 4273 "configure"
#include "confdefs.h"
#include <openssl/err.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4278: \"$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*
@@ -4283,12 +4303,12 @@ fi
## Types, structures, compiler characteristics
##
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4287: checking for working const" >&5
+echo "configure:4307: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4292 "configure"
+#line 4312 "configure"
#include "confdefs.h"
int main() {
@@ -4337,7 +4357,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:4341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -4358,21 +4378,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:4362: checking for inline" >&5
+echo "configure:4382: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 4369 "configure"
+#line 4389 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:4376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -4400,12 +4420,12 @@ esac
echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6
-echo "configure:4404: checking for preprocessor stringizing operator" >&5
+echo "configure:4424: checking for preprocessor stringizing operator" >&5
if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4409 "configure"
+#line 4429 "configure"
#include "confdefs.h"
#define x(y) #y
@@ -4435,19 +4455,19 @@ fi
echo "$ac_t""${ac_cv_c_stringize}" 1>&6
echo $ac_n "checking for signed types""... $ac_c" 1>&6
-echo "configure:4439: checking for signed types" >&5
+echo "configure:4459: checking for signed types" >&5
if eval "test \"`echo '$''{'pgac_cv_c_signed'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4444 "configure"
+#line 4464 "configure"
#include "confdefs.h"
int main() {
signed char c; signed short s; signed int i;
; return 0; }
EOF
-if { (eval echo configure:4451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_c_signed=yes
else
@@ -4467,19 +4487,19 @@ EOF
fi
echo $ac_n "checking for volatile""... $ac_c" 1>&6
-echo "configure:4471: checking for volatile" >&5
+echo "configure:4491: checking for volatile" >&5
if eval "test \"`echo '$''{'pgac_cv_c_volatile'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4476 "configure"
+#line 4496 "configure"
#include "confdefs.h"
int main() {
extern volatile int i;
; return 0; }
EOF
-if { (eval echo configure:4483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_c_volatile=yes
else
@@ -4499,12 +4519,12 @@ EOF
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4503: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4523: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4508 "configure"
+#line 4528 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -4512,7 +4532,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:4516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -4533,12 +4553,12 @@ EOF
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4537: checking for tm_zone in struct tm" >&5
+echo "configure:4557: checking for tm_zone in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4542 "configure"
+#line 4562 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -4546,7 +4566,7 @@ int main() {
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:4550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
@@ -4566,12 +4586,12 @@ EOF
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4570: checking for tzname" >&5
+echo "configure:4590: checking for tzname" >&5
if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4575 "configure"
+#line 4595 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
@@ -4581,7 +4601,7 @@ int main() {
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
@@ -4603,12 +4623,12 @@ EOF
fi
echo $ac_n "checking for union semun""... $ac_c" 1>&6
-echo "configure:4607: checking for union semun" >&5
+echo "configure:4627: checking for union semun" >&5
if eval "test \"`echo '$''{'pgac_cv_union_semun'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4612 "configure"
+#line 4632 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/ipc.h>
@@ -4617,7 +4637,7 @@ int main() {
union semun semun;
; return 0; }
EOF
-if { (eval echo configure:4621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_union_semun=yes
else
@@ -4642,19 +4662,19 @@ fi
## Functions, global variables
##
echo $ac_n "checking for int timezone""... $ac_c" 1>&6
-echo "configure:4646: checking for int timezone" >&5
+echo "configure:4666: checking for int timezone" >&5
if eval "test \"`echo '$''{'pgac_cv_var_int_timezone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4651 "configure"
+#line 4671 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
int res = timezone / 60;
; return 0; }
EOF
-if { (eval echo configure:4658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
pgac_cv_var_int_timezone=yes
else
@@ -4674,7 +4694,7 @@ EOF
fi
echo $ac_n "checking types of arguments for accept()""... $ac_c" 1>&6
-echo "configure:4678: checking types of arguments for accept()" >&5
+echo "configure:4698: checking types of arguments for accept()" >&5
if eval "test \"`echo '$''{'ac_cv_func_accept_arg1'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4688,7 +4708,7 @@ else
for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'void *'; do
for ac_cv_func_accept_arg3 in 'socklen_t' 'size_t' 'unsigned int' 'int'; do
cat > conftest.$ac_ext <<EOF
-#line 4692 "configure"
+#line 4712 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -4701,7 +4721,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_not_found=no ; break 3
else
@@ -4740,12 +4760,12 @@ EOF
echo $ac_n "checking whether gettimeofday takes only one argument""... $ac_c" 1>&6
-echo "configure:4744: checking whether gettimeofday takes only one argument" >&5
+echo "configure:4764: checking whether gettimeofday takes only one argument" >&5
if eval "test \"`echo '$''{'pgac_cv_func_gettimeofday_1arg'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4749 "configure"
+#line 4769 "configure"
#include "confdefs.h"
#include <sys/time.h>
int main() {
@@ -4754,7 +4774,7 @@ struct timezone *tzp;
gettimeofday(tp,tzp);
; return 0; }
EOF
-if { (eval echo configure:4758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
pgac_cv_func_gettimeofday_1arg=no
else
@@ -4775,21 +4795,24 @@ EOF
fi
echo $ac_n "checking for fcntl(F_SETLK)""... $ac_c" 1>&6
-echo "configure:4779: checking for fcntl(F_SETLK)" >&5
-if test "$os" != linux ; then
+echo "configure:4799: checking for fcntl(F_SETLK)" >&5
+case $host_os in
+ linux*) echo "$ac_t""broken on Linux" 1>&6 ;;
+ *)
cat > conftest.$ac_ext <<EOF
-#line 4782 "configure"
+#line 4804 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <fcntl.h>
+
int main() {
struct flock lck;
- lck.l_whence = SEEK_SET; lck.l_start = lck.l_len = 0;
- lck.l_type = F_WRLCK;
- fcntl(0, F_SETLK, &lck);
+lck.l_whence = SEEK_SET; lck.l_start = lck.l_len = 0;
+lck.l_type = F_WRLCK;
+fcntl(0, F_SETLK, &lck);
; return 0; }
EOF
-if { (eval echo configure:4793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_FCNTL_SETLK 1
@@ -4802,19 +4825,18 @@ else
echo "$ac_t""no" 1>&6
fi
rm -f conftest*
-else
- echo "$ac_t""broken on Linux" 1>&6
-fi
+ ;;
+esac
for ac_func in fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4813: checking for $ac_func" >&5
+echo "configure:4835: 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 4818 "configure"
+#line 4840 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4837,7 +4859,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4863: \"$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
@@ -4863,12 +4885,12 @@ done
echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6
-echo "configure:4867: checking for PS_STRINGS" >&5
+echo "configure:4889: checking for PS_STRINGS" >&5
if eval "test \"`echo '$''{'pgac_cv_var_PS_STRINGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4872 "configure"
+#line 4894 "configure"
#include "confdefs.h"
#include <machine/vmparam.h>
#include <sys/exec.h>
@@ -4878,7 +4900,7 @@ PS_STRINGS->ps_nargvstr = 1;
PS_STRINGS->ps_argvstr = "foo";
; return 0; }
EOF
-if { (eval echo configure:4882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
pgac_cv_var_PS_STRINGS=yes
else
@@ -4900,12 +4922,12 @@ fi
SNPRINTF=''
echo $ac_n "checking for snprintf""... $ac_c" 1>&6
-echo "configure:4904: checking for snprintf" >&5
+echo "configure:4926: checking for snprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4909 "configure"
+#line 4931 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char snprintf(); below. */
@@ -4928,7 +4950,7 @@ snprintf();
; return 0; }
EOF
-if { (eval echo configure:4932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_snprintf=yes"
else
@@ -4952,12 +4974,12 @@ SNPRINTF='snprintf.o'
fi
echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
-echo "configure:4956: checking for vsnprintf" >&5
+echo "configure:4978: checking for vsnprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4961 "configure"
+#line 4983 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vsnprintf(); below. */
@@ -4980,7 +5002,7 @@ vsnprintf();
; return 0; }
EOF
-if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vsnprintf=yes"
else
@@ -5005,7 +5027,7 @@ fi
cat > conftest.$ac_ext <<EOF
-#line 5009 "configure"
+#line 5031 "configure"
#include "confdefs.h"
#include <stdio.h>
EOF
@@ -5020,7 +5042,7 @@ fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 5024 "configure"
+#line 5046 "configure"
#include "confdefs.h"
#include <stdio.h>
EOF
@@ -5037,12 +5059,12 @@ rm -f conftest*
# do this one the hard way in case isinf() is a macro
echo $ac_n "checking for isinf""... $ac_c" 1>&6
-echo "configure:5041: checking for isinf" >&5
+echo "configure:5063: checking for isinf" >&5
if eval "test \"`echo '$''{'ac_cv_func_isinf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5046 "configure"
+#line 5068 "configure"
#include "confdefs.h"
#include <math.h>
@@ -5050,7 +5072,7 @@ int main() {
double x = 0.0; int res = isinf(x);
; return 0; }
EOF
-if { (eval echo configure:5054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_isinf=yes
else
@@ -5076,12 +5098,12 @@ else
for ac_func in fpclass fp_class fp_class_d class
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5080: checking for $ac_func" >&5
+echo "configure:5102: 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 5085 "configure"
+#line 5107 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5104,7 +5126,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5130: \"$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
@@ -5132,12 +5154,12 @@ fi
echo $ac_n "checking for getrusage""... $ac_c" 1>&6
-echo "configure:5136: checking for getrusage" >&5
+echo "configure:5158: checking for getrusage" >&5
if eval "test \"`echo '$''{'ac_cv_func_getrusage'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5141 "configure"
+#line 5163 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getrusage(); below. */
@@ -5160,7 +5182,7 @@ getrusage();
; return 0; }
EOF
-if { (eval echo configure:5164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_getrusage=yes"
else
@@ -5185,12 +5207,12 @@ fi
echo $ac_n "checking for srandom""... $ac_c" 1>&6
-echo "configure:5189: checking for srandom" >&5
+echo "configure:5211: checking for srandom" >&5
if eval "test \"`echo '$''{'ac_cv_func_srandom'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5194 "configure"
+#line 5216 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char srandom(); below. */
@@ -5213,7 +5235,7 @@ srandom();
; return 0; }
EOF
-if { (eval echo configure:5217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_srandom=yes"
else
@@ -5238,12 +5260,12 @@ fi
echo $ac_n "checking for gethostname""... $ac_c" 1>&6
-echo "configure:5242: checking for gethostname" >&5
+echo "configure:5264: checking for gethostname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5247 "configure"
+#line 5269 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostname(); below. */
@@ -5266,7 +5288,7 @@ gethostname();
; return 0; }
EOF
-if { (eval echo configure:5270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostname=yes"
else
@@ -5291,12 +5313,12 @@ fi
echo $ac_n "checking for random""... $ac_c" 1>&6
-echo "configure:5295: checking for random" >&5
+echo "configure:5317: checking for random" >&5
if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5300 "configure"
+#line 5322 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char random(); below. */
@@ -5319,7 +5341,7 @@ random();
; return 0; }
EOF
-if { (eval echo configure:5323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_random=yes"
else
@@ -5344,12 +5366,12 @@ fi
echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
-echo "configure:5348: checking for inet_aton" >&5
+echo "configure:5370: checking for inet_aton" >&5
if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5353 "configure"
+#line 5375 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char inet_aton(); below. */
@@ -5372,7 +5394,7 @@ inet_aton();
; return 0; }
EOF
-if { (eval echo configure:5376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_inet_aton=yes"
else
@@ -5397,12 +5419,12 @@ fi
echo $ac_n "checking for strerror""... $ac_c" 1>&6
-echo "configure:5401: checking for strerror" >&5
+echo "configure:5423: checking for strerror" >&5
if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5406 "configure"
+#line 5428 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strerror(); below. */
@@ -5425,7 +5447,7 @@ strerror();
; return 0; }
EOF
-if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_strerror=yes"
else
@@ -5451,12 +5473,12 @@ fi
echo $ac_n "checking for strdup""... $ac_c" 1>&6
-echo "configure:5455: checking for strdup" >&5
+echo "configure:5477: checking for strdup" >&5
if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5460 "configure"
+#line 5482 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strdup(); below. */
@@ -5479,7 +5501,7 @@ strdup();
; return 0; }
EOF
-if { (eval echo configure:5483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_strdup=yes"
else
@@ -5504,12 +5526,12 @@ fi
echo $ac_n "checking for strtol""... $ac_c" 1>&6
-echo "configure:5508: checking for strtol" >&5
+echo "configure:5530: checking for strtol" >&5
if eval "test \"`echo '$''{'ac_cv_func_strtol'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5513 "configure"
+#line 5535 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strtol(); below. */
@@ -5532,7 +5554,7 @@ strtol();
; return 0; }
EOF
-if { (eval echo configure:5536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_strtol=yes"
else
@@ -5557,12 +5579,12 @@ fi
echo $ac_n "checking for strtoul""... $ac_c" 1>&6
-echo "configure:5561: checking for strtoul" >&5
+echo "configure:5583: checking for strtoul" >&5
if eval "test \"`echo '$''{'ac_cv_func_strtoul'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5566 "configure"
+#line 5588 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strtoul(); below. */
@@ -5585,7 +5607,7 @@ strtoul();
; return 0; }
EOF
-if { (eval echo configure:5589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_strtoul=yes"
else
@@ -5610,12 +5632,12 @@ fi
echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
-echo "configure:5614: checking for strcasecmp" >&5
+echo "configure:5636: checking for strcasecmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5619 "configure"
+#line 5641 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strcasecmp(); below. */
@@ -5638,7 +5660,7 @@ strcasecmp();
; return 0; }
EOF
-if { (eval echo configure:5642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_strcasecmp=yes"
else
@@ -5663,12 +5685,12 @@ fi
echo $ac_n "checking for cbrt""... $ac_c" 1>&6
-echo "configure:5667: checking for cbrt" >&5
+echo "configure:5689: checking for cbrt" >&5
if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5672 "configure"
+#line 5694 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cbrt(); below. */
@@ -5691,7 +5713,7 @@ cbrt();
; return 0; }
EOF
-if { (eval echo configure:5695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_cbrt=yes"
else
@@ -5712,7 +5734,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
-echo "configure:5716: checking for cbrt in -lm" >&5
+echo "configure:5738: checking for cbrt in -lm" >&5
ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5720,7 +5742,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5724 "configure"
+#line 5746 "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
@@ -5731,7 +5753,7 @@ int main() {
cbrt()
; return 0; }
EOF
-if { (eval echo configure:5735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5757: \"$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
@@ -5760,7 +5782,7 @@ fi
# On HPUX 9, rint() is not in regular libm.a but in /lib/pa1.1/libm.a;
# this hackery with HPUXMATHLIB allows us to cope.
HPUXMATHLIB=""
-case "$host_cpu" in
+case $host_cpu in
hppa1.1)
if [ -r /lib/pa1.1/libm.a ] ; then
HPUXMATHLIB="-L /lib/pa1.1 -lm"
@@ -5769,12 +5791,12 @@ esac
echo $ac_n "checking for rint""... $ac_c" 1>&6
-echo "configure:5773: checking for rint" >&5
+echo "configure:5795: checking for rint" >&5
if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5778 "configure"
+#line 5800 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char rint(); below. */
@@ -5797,7 +5819,7 @@ rint();
; return 0; }
EOF
-if { (eval echo configure:5801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_rint=yes"
else
@@ -5818,7 +5840,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
-echo "configure:5822: checking for rint in -lm" >&5
+echo "configure:5844: checking for rint in -lm" >&5
ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5826,7 +5848,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $HPUXMATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5830 "configure"
+#line 5852 "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
@@ -5837,7 +5859,7 @@ int main() {
rint()
; return 0; }
EOF
-if { (eval echo configure:5841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5863: \"$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
@@ -5864,7 +5886,7 @@ fi
cat > conftest.$ac_ext <<EOF
-#line 5868 "configure"
+#line 5890 "configure"
#include "confdefs.h"
#include <readline.h>
EOF
@@ -5878,7 +5900,7 @@ EOF
else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 5882 "configure"
+#line 5904 "configure"
#include "confdefs.h"
#include <readline/readline.h>
EOF
@@ -5900,12 +5922,12 @@ rm -f conftest*
for ac_func in filename_completion_function
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5904: checking for $ac_func" >&5
+echo "configure:5926: 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 5909 "configure"
+#line 5931 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5928,7 +5950,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5954: \"$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
@@ -5947,7 +5969,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
#define $ac_tr_func 1
EOF
cat > conftest.$ac_ext <<EOF
-#line 5951 "configure"
+#line 5973 "configure"
#include "confdefs.h"
#include <readline.h>
EOF
@@ -5961,7 +5983,7 @@ EOF
else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 5965 "configure"
+#line 5987 "configure"
#include "confdefs.h"
#include <readline/readline.h>
EOF
@@ -5989,16 +6011,16 @@ done
echo $ac_n "checking for finite""... $ac_c" 1>&6
-echo "configure:5993: checking for finite" >&5
+echo "configure:6015: checking for finite" >&5
cat > conftest.$ac_ext <<EOF
-#line 5995 "configure"
+#line 6017 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
int dummy=finite(1.0);
; return 0; }
EOF
-if { (eval echo configure:6002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_FINITE 1
@@ -6013,16 +6035,16 @@ fi
rm -f conftest*
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:6017: checking for sigsetjmp" >&5
+echo "configure:6039: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <<EOF
-#line 6019 "configure"
+#line 6041 "configure"
#include "confdefs.h"
#include <setjmp.h>
int main() {
sigjmp_buf x; sigsetjmp(x, 1);
; return 0; }
EOF
-if { (eval echo configure:6026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_SIGSETJMP 1
@@ -6041,12 +6063,12 @@ if test "${enable_syslog+set}" = set; then
enableval="$enable_syslog"
case $enableval in y|ye|yes)
echo $ac_n "checking for syslog""... $ac_c" 1>&6
-echo "configure:6045: checking for syslog" >&5
+echo "configure:6067: checking for syslog" >&5
if eval "test \"`echo '$''{'ac_cv_func_syslog'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6050 "configure"
+#line 6072 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char syslog(); below. */
@@ -6069,7 +6091,7 @@ syslog();
; return 0; }
EOF
-if { (eval echo configure:6073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_syslog=yes"
else
@@ -6100,7 +6122,7 @@ fi
echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6
-echo "configure:6104: checking whether long int is 64 bits" >&5
+echo "configure:6126: checking whether long int is 64 bits" >&5
if eval "test \"`echo '$''{'pgac_cv_type_long_int_64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6109,7 +6131,7 @@ else
echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
else
cat > conftest.$ac_ext <<EOF
-#line 6113 "configure"
+#line 6135 "configure"
#include "confdefs.h"
typedef long int int64;
@@ -6138,7 +6160,7 @@ main() {
exit(! does_int64_work());
}
EOF
-if { (eval echo configure:6142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pgac_cv_type_long_int_64=yes
else
@@ -6165,7 +6187,7 @@ fi
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 "configure:6169: checking whether long long int is 64 bits" >&5
+echo "configure:6191: checking whether long long int is 64 bits" >&5
if eval "test \"`echo '$''{'pgac_cv_type_long_long_int_64'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6174,7 +6196,7 @@ else
echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
else
cat > conftest.$ac_ext <<EOF
-#line 6178 "configure"
+#line 6200 "configure"
#include "confdefs.h"
typedef long long int int64;
@@ -6203,7 +6225,7 @@ main() {
exit(! does_int64_work());
}
EOF
-if { (eval echo configure:6207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pgac_cv_type_long_long_int_64=yes
else
@@ -6234,7 +6256,7 @@ fi
if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
if [ x$SNPRINTF = x ] ; then
echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6
-echo "configure:6238: checking whether snprintf handles 'long long int' as %lld" >&5
+echo "configure:6260: checking whether snprintf handles 'long long int' as %lld" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""assuming not on target machine" 1>&6
# Force usage of our own snprintf, since we cannot test foreign snprintf
@@ -6243,7 +6265,7 @@ echo "configure:6238: checking whether snprintf handles 'long long int' as %lld"
else
cat > conftest.$ac_ext <<EOF
-#line 6247 "configure"
+#line 6269 "configure"
#include "confdefs.h"
#include <stdio.h>
typedef long long int int64;
@@ -6270,7 +6292,7 @@ main() {
exit(! does_int64_snprintf_work());
}
EOF
-if { (eval echo configure:6274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
INT64_FORMAT='"%lld"'
@@ -6281,7 +6303,7 @@ else
rm -fr conftest*
echo "$ac_t""no" 1>&6
echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6
-echo "configure:6285: checking whether snprintf handles 'long long int' as %qd" >&5
+echo "configure:6307: checking whether snprintf handles 'long long int' as %qd" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""assuming not on target machine" 1>&6
# Force usage of our own snprintf, since we cannot test foreign snprintf
@@ -6290,7 +6312,7 @@ echo "configure:6285: checking whether snprintf handles 'long long int' as %qd"
else
cat > conftest.$ac_ext <<EOF
-#line 6294 "configure"
+#line 6316 "configure"
#include "confdefs.h"
#include <stdio.h>
typedef long long int int64;
@@ -6317,7 +6339,7 @@ main() {
exit(! does_int64_snprintf_work());
}
EOF
-if { (eval echo configure:6321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
INT64_FORMAT='"%qd"'
@@ -6356,7 +6378,7 @@ EOF
echo $ac_n "checking alignment of short""... $ac_c" 1>&6
-echo "configure:6360: checking alignment of short" >&5
+echo "configure:6382: checking alignment of short" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6364,7 +6386,7 @@ else
pgac_cv_alignof_short='sizeof(short)'
else
cat > conftest.$ac_ext <<EOF
-#line 6368 "configure"
+#line 6390 "configure"
#include "confdefs.h"
#include <stdio.h>
struct { char filler; short field; } mystruct;
@@ -6376,7 +6398,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pgac_cv_alignof_short=`cat conftestval`
else
@@ -6396,7 +6418,7 @@ EOF
echo $ac_n "checking alignment of int""... $ac_c" 1>&6
-echo "configure:6400: checking alignment of int" >&5
+echo "configure:6422: checking alignment of int" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6404,7 +6426,7 @@ else
pgac_cv_alignof_int='sizeof(int)'
else
cat > conftest.$ac_ext <<EOF
-#line 6408 "configure"
+#line 6430 "configure"
#include "confdefs.h"
#include <stdio.h>
struct { char filler; int field; } mystruct;
@@ -6416,7 +6438,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pgac_cv_alignof_int=`cat conftestval`
else
@@ -6436,7 +6458,7 @@ EOF
echo $ac_n "checking alignment of long""... $ac_c" 1>&6
-echo "configure:6440: checking alignment of long" >&5
+echo "configure:6462: checking alignment of long" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6444,7 +6466,7 @@ else
pgac_cv_alignof_long='sizeof(long)'
else
cat > conftest.$ac_ext <<EOF
-#line 6448 "configure"
+#line 6470 "configure"
#include "confdefs.h"
#include <stdio.h>
struct { char filler; long field; } mystruct;
@@ -6456,7 +6478,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pgac_cv_alignof_long=`cat conftestval`
else
@@ -6477,7 +6499,7 @@ EOF
if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6
-echo "configure:6481: checking alignment of long long int" >&5
+echo "configure:6503: checking alignment of long long int" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_long_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6485,7 +6507,7 @@ else
pgac_cv_alignof_long_long_int='sizeof(long long int)'
else
cat > conftest.$ac_ext <<EOF
-#line 6489 "configure"
+#line 6511 "configure"
#include "confdefs.h"
#include <stdio.h>
struct { char filler; long long int field; } mystruct;
@@ -6497,7 +6519,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pgac_cv_alignof_long_long_int=`cat conftestval`
else
@@ -6518,7 +6540,7 @@ EOF
fi
echo $ac_n "checking alignment of double""... $ac_c" 1>&6
-echo "configure:6522: checking alignment of double" >&5
+echo "configure:6544: checking alignment of double" >&5
if eval "test \"`echo '$''{'pgac_cv_alignof_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6526,7 +6548,7 @@ else
pgac_cv_alignof_double='sizeof(double)'
else
cat > conftest.$ac_ext <<EOF
-#line 6530 "configure"
+#line 6552 "configure"
#include "confdefs.h"
#include <stdio.h>
struct { char filler; double field; } mystruct;
@@ -6538,7 +6560,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
pgac_cv_alignof_double=`cat conftestval`
else
@@ -6576,12 +6598,12 @@ EOF
echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6
-echo "configure:6580: checking for POSIX signal interface" >&5
+echo "configure:6602: checking for POSIX signal interface" >&5
if eval "test \"`echo '$''{'pgac_cv_func_posix_signals'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6585 "configure"
+#line 6607 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -6592,7 +6614,7 @@ act.sa_flags = SA_RESTART;
sigaction(0, &act, &oact);
; return 0; }
EOF
-if { (eval echo configure:6596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
pgac_cv_func_posix_signals=yes
else
@@ -6621,7 +6643,7 @@ then
# Extract the first word of "tclsh", so it can be a program name with args.
set dummy tclsh; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6625: checking for $ac_word" >&5
+echo "configure:6647: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6658,7 +6680,7 @@ fi
# Extract the first word of "tcl", so it can be a program name with args.
set dummy tcl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6662: checking for $ac_word" >&5
+echo "configure:6684: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6701,7 +6723,7 @@ fi
if test "$USE_TCL" = true
then
echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
-echo "configure:6705: checking for tclConfig.sh" >&5
+echo "configure:6727: checking for tclConfig.sh" >&5
TCL_CONFIG_SH=
library_dirs=
if test -z "$TCL_DIRS"
@@ -6730,7 +6752,7 @@ USE_TK=$USE_TCL # If TCL is disabled, disable TK
if test "$USE_TK" = true
then
echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6
-echo "configure:6734: checking for tkConfig.sh" >&5
+echo "configure:6756: checking for tkConfig.sh" >&5
TK_CONFIG_SH=
# library_dirs are set in the check for TCL
for dir in $library_dirs
@@ -6752,7 +6774,7 @@ echo "configure:6734: checking for tkConfig.sh" >&5
# Extract the first word of "wish", so it can be a program name with args.
set dummy wish; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6756: checking for $ac_word" >&5
+echo "configure:6778: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_WISH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6787,6 +6809,7 @@ fi
fi
fi
+
USE_X=$USE_TK
@@ -6802,7 +6825,7 @@ if test "$USE_X" = true; then
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:6806: checking for X" >&5
+echo "configure:6829: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -6864,12 +6887,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 6868 "configure"
+#line 6891 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6896: \"$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*
@@ -6938,14 +6961,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6942 "configure"
+#line 6965 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:6949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -7051,17 +7074,17 @@ else
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:7055: checking whether -R must be followed by a space" >&5
+echo "configure:7078: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 7058 "configure"
+#line 7081 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:7065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -7077,14 +7100,14 @@ rm -f conftest*
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 7081 "configure"
+#line 7104 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:7088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -7116,7 +7139,7 @@ rm -f conftest*
# libraries were built with DECnet support. And [email protected] says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:7120: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:7143: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7124,7 +7147,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7128 "configure"
+#line 7151 "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
@@ -7135,7 +7158,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:7139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7162: \"$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
@@ -7157,7 +7180,7 @@ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:7161: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:7184: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7165,7 +7188,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7169 "configure"
+#line 7192 "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
@@ -7176,7 +7199,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:7180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7203: \"$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
@@ -7205,12 +7228,12 @@ fi
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to [email protected].
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:7209: checking for gethostbyname" >&5
+echo "configure:7232: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7214 "configure"
+#line 7237 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -7233,7 +7256,7 @@ gethostbyname();
; return 0; }
EOF
-if { (eval echo configure:7237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -7254,7 +7277,7 @@ fi
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:7258: checking for gethostbyname in -lnsl" >&5
+echo "configure:7281: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7262,7 +7285,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7266 "configure"
+#line 7289 "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
@@ -7273,7 +7296,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:7277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7300: \"$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
@@ -7303,12 +7326,12 @@ fi
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:7307: checking for connect" >&5
+echo "configure:7330: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7312 "configure"
+#line 7335 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -7331,7 +7354,7 @@ connect();
; return 0; }
EOF
-if { (eval echo configure:7335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -7352,7 +7375,7 @@ fi
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:7356: checking for connect in -lsocket" >&5
+echo "configure:7379: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7360,7 +7383,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7364 "configure"
+#line 7387 "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
@@ -7371,7 +7394,7 @@ int main() {
connect()
; return 0; }
EOF
-if { (eval echo configure:7375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7398: \"$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
@@ -7395,12 +7418,12 @@ fi
# [email protected] says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:7399: checking for remove" >&5
+echo "configure:7422: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7404 "configure"
+#line 7427 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -7423,7 +7446,7 @@ remove();
; return 0; }
EOF
-if { (eval echo configure:7427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -7444,7 +7467,7 @@ fi
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:7448: checking for remove in -lposix" >&5
+echo "configure:7471: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7452,7 +7475,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7456 "configure"
+#line 7479 "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
@@ -7463,7 +7486,7 @@ int main() {
remove()
; return 0; }
EOF
-if { (eval echo configure:7467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7490: \"$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
@@ -7487,12 +7510,12 @@ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:7491: checking for shmat" >&5
+echo "configure:7514: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7496 "configure"
+#line 7519 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -7515,7 +7538,7 @@ shmat();
; return 0; }
EOF
-if { (eval echo configure:7519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -7536,7 +7559,7 @@ fi
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:7540: checking for shmat in -lipc" >&5
+echo "configure:7563: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7544,7 +7567,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7548 "configure"
+#line 7571 "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
@@ -7555,7 +7578,7 @@ int main() {
shmat()
; return 0; }
EOF
-if { (eval echo configure:7559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7582: \"$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
@@ -7588,7 +7611,7 @@ fi
# libraries we check for below, so use a different variable.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:7592: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:7615: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7596,7 +7619,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7600 "configure"
+#line 7623 "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
@@ -7607,7 +7630,7 @@ int main() {
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:7611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7634: \"$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
@@ -7640,7 +7663,7 @@ fi
X11_LIBS=""
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:7644: checking for XOpenDisplay in -lX11" >&5
+echo "configure:7667: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7648,7 +7671,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lX11 ${X_PRE_LIBS} $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7652 "configure"
+#line 7675 "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
@@ -7659,7 +7682,7 @@ int main() {
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:7663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7686: \"$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
@@ -7849,12 +7872,20 @@ s%@host_alias@%$host_alias%g
s%@host_cpu@%$host_cpu%g
s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g
+s%@PORTNAME@%$PORTNAME%g
+s%@CPU@%$CPU%g
s%@TAS@%$TAS%g
-s%@INCLUDES@%$INCLUDES%g
s%@MULTIBYTE@%$MULTIBYTE%g
s%@CC@%$CC%g
s%@CPP@%$CPP%g
s%@GCC@%$GCC%g
+s%@AROPT@%$AROPT%g
+s%@SHARED_LIB@%$SHARED_LIB%g
+s%@DLSUFFIX@%$DLSUFFIX%g
+s%@DL_LIB@%$DL_LIB%g
+s%@INCLUDES@%$INCLUDES%g
+s%@USE_TCL@%$USE_TCL%g
+s%@USE_TK@%$USE_TK%g
s%@with_perl@%$with_perl%g
s%@PYTHON@%$PYTHON%g
s%@python_version@%$python_version%g
@@ -7872,16 +7903,6 @@ s%@with_openssl@%$with_openssl%g
s%@enable_odbc@%$enable_odbc%g
s%@odbcinst_ini_dir@%$odbcinst_ini_dir%g
s%@ELF_SYS@%$ELF_SYS%g
-s%@PORTNAME@%$PORTNAME%g
-s%@CPU@%$CPU%g
-s%@SRCDIR@%$SRCDIR%g
-s%@AROPT@%$AROPT%g
-s%@SHARED_LIB@%$SHARED_LIB%g
-s%@DLSUFFIX@%$DLSUFFIX%g
-s%@DL_LIB@%$DL_LIB%g
-s%@USE_TCL@%$USE_TCL%g
-s%@USE_TK@%$USE_TK%g
-s%@WISH@%$WISH%g
s%@CXX@%$CXX%g
s%@CXXCPP@%$CXXCPP%g
s%@with_CXX@%$with_CXX%g
@@ -7920,6 +7941,7 @@ s%@HAVE_POSIX_SIGNALS@%$HAVE_POSIX_SIGNALS%g
s%@TCLSH@%$TCLSH%g
s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g
s%@TK_CONFIG_SH@%$TK_CONFIG_SH%g
+s%@WISH@%$WISH%g
s%@X_CFLAGS@%$X_CFLAGS%g
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
s%@X_LIBS@%$X_LIBS%g
@@ -8140,7 +8162,7 @@ fi; done
EOF
cat >> $CONFIG_STATUS <<EOF
-ac_sources="src/backend/port/dynloader/${os}.c src/backend/port/dynloader/${os}.h src/include/port/${os}.h src/makefiles/Makefile.${os} src/backend/port/tas/${tas_file}"
+ac_sources="src/backend/port/dynloader/${template}.c src/backend/port/dynloader/${template}.h src/include/port/${template}.h src/makefiles/Makefile.${template} src/backend/port/tas/${tas_file}"
ac_dests="src/backend/port/dynloader.c src/include/dynloader.h src/include/os.h src/Makefile.port src/backend/port/tas.s"
EOF
diff --git a/configure.in b/configure.in
index fa535f23ba..ebcb53183f 100644
--- a/configure.in
+++ b/configure.in
@@ -27,206 +27,134 @@ AC_DEFINE_UNQUOTED(PG_VERSION, "$VERSION")
AC_CANONICAL_HOST
-tas_file=dummy.s
-case "$host_os" in
+template=
+AC_MSG_CHECKING([which template to use])
+
+# check if --with-template was given
+if test x"${with_template+set}" = xset ; then
+ case $with_template in
+ yes|no) AC_MSG_ERROR([You must supply an argument to the --with-template option.]);;
+ list) echo; ls "$srcdir/src/template"; exit;;
+ *) if test -f "$srcdir/src/template/$with_template" ; then
+ template=$with_template
+ else
+ AC_MSG_ERROR([\`$with_template' is not a valid template name. Use \`list' for a list.])
+ fi;;
+ esac
+
+else # --with-template not given
+
+case $host_os in
+ aix*) template=aix ;;
+ bsdi*) template=bsdi ;;
+ cygwin*) template=win ;;
+ dgux*) template=dgux ;;
+ freebsd*) template=freebsd ;;
+ hpux*) template=hpux ;;
+ irix*) template=irix5 ;;
+ linux*) template=linux ;;
+ netbsd*) template=netbsd ;;
+nextstep*) template=nextstep ;;
+ openbsd*) template=openbsd ;;
+ osf*) template=osf ;;
+ qnx*) template=qnx4 ;;
+ sco*) template=sco ;;
solaris*)
- case "$host_cpu" in
- sparc) os=solaris_sparc need_tas=yes tas_file=solaris_sparc.s ;;
- i386) os=solaris_i386 need_tas=yes tas_file=solaris_i386.s ;;
+ case $host_cpu in
+ sparc) template=solaris_sparc ;;
+ i?86) template=solaris_i386 ;;
esac ;;
- sunos*) os=sunos4 need_tas=no ;;
- beos) os=beos need_tas=no ;;
- aux*) os=aux need_tas=no ;;
- linux*) os=linux need_tas=no ;;
- bsdi*) os=bsdi need_tas=no ;;
- freebsd1*|freebsd2*) os=freebsd need_tas=no ;;
- freebsd*) os=freebsd need_tas=no elf=yes ;;
- netbsd*) os=netbsd need_tas=no ;;
- openbsd*) os=bsd need_tas=no ;;
- dgux*) os=dgux need_tas=no ;;
- aix*) os=aix need_tas=no ;;
-nextstep*) os=nextstep need_tas=no ;;
- ultrix*) os=ultrix4 need_tas=no ;;
- irix*) os=irix5 need_tas=no ;;
- hpux*) os=hpux need_tas=yes tas_file=hpux.s ;;
- osf*) os=alpha need_tas=no ;;
- sco*) os=sco need_tas=no ;;
- machten*) os=machten need_tas=no ;;
- cygwin*) os=win need_tas=no ;;
+ sunos*) template=sunos4 ;;
sysv4.2*)
- case "$host_vendor" in
- univel) os=univel need_tas=no ;;
- *) os=unknown need_tas=no ;;
- esac ;;
- sysv4*) os=svr4 need_tas=no ;;
- sysv5uw*) os=unixware need_tas=no ;;
- unixware*) os=unixware need_tas=no ;;
- qnx*) os=qnx4 need_tas=no ;;
-*) echo ""
- echo "*************************************************************"
- echo "configure does not currently recognize your operating system,"
- echo "therefore you must do a manual configuration of:"
- echo "$host_os"
- echo "Please contact [email protected] to see about rectifying this, "
- echo "including the above 'checking host system type...' line "
- echo "*************************************************************"
- echo ""
- exit;;
+ case $host_vendor in
+ univel) template=univel ;;
+ esac ;;
+ sysv4*) template=svr4 ;;
+ sysv5uw*) template=unixware ;;
+ ultrix*) template=ultrix4 ;;
esac
-PORTNAME=${os}
-CPU=${host_cpu}
-AC_LINK_FILES(src/backend/port/dynloader/${os}.c, src/backend/port/dynloader.c)
-AC_LINK_FILES(src/backend/port/dynloader/${os}.h, src/include/dynloader.h)
-AC_LINK_FILES(src/include/port/${os}.h, src/include/os.h)
-AC_LINK_FILES(src/makefiles/Makefile.${os}, src/Makefile.port)
+ if test x"$template" = x"" ; then
+ AC_MSG_ERROR([
+*******************************************************************
+PostgreSQL has apparently not been ported to your platform yet.
+To try a manual configuration, look info the src/template directory
+for a similar platform and use the \`--with-template=' option.
+
+Please also contact <[email protected]> to see about
+rectifying this. Include the above \`checking host system type...'
+line.
+*******************************************************************
+])
+ fi
-if test "X$need_tas" = "Xyes"
-then
- AC_LINK_FILES(src/backend/port/tas/${tas_file}, src/backend/port/tas.s)
- TAS=tas.o
- AC_SUBST(TAS)
-fi
+fi # --with-template not given
-dnl this part selects the template from the ones in the template directory.
+AC_MSG_RESULT([$template])
-AC_MSG_CHECKING(setting template to)
-AC_ARG_WITH(template,
- [ --with-template=TEMPLATE
- use operating system template file
- see template directory],
- [ TEMPLATE=$withval ],
- [
+PORTNAME=$template
+CPU=$host_cpu
+AC_SUBST(PORTNAME)
+AC_SUBST(CPU)
-# lowercase $host
-host="`echo $host | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`"
+AC_LINK_FILES([src/backend/port/dynloader/${template}.c], [src/backend/port/dynloader.c])
+AC_LINK_FILES([src/backend/port/dynloader/${template}.h], [src/include/dynloader.h])
+AC_LINK_FILES([src/include/port/${template}.h], [src/include/os.h])
+AC_LINK_FILES([src/makefiles/Makefile.${template}], [src/Makefile.port])
-# First, try for a template exactly matching $host
-if test -f "src/template/$host"
-then TEMPLATE="$host"
-else
- # Scan template/.similar for a rule that tells us which template to use.
- # The format of each line of the file is
- # hostnamepattern=templatefilename
- # where the hostnamepattern is evaluated per the rules of expr(1) ---
- # namely, it is a standard regular expression with an implicit ^ at the
- # start. If multiple lines match, we will end up using the last match.
- #
- # The tempfile hackery is needed because some shells will run the loop
- # inside a subshell, whereupon shell variables set therein aren't seen
- # outside the loop :-(
- TMPFILE="guesses.$$"
- cat /dev/null > $TMPFILE
- while read LINE
- do
- SIMHOST=`expr "$LINE" : '\(.*\)='`
- MATCH=`expr "$host" : "$SIMHOST"`
- if test "$MATCH" != 0
- then
- echo "$LINE" | sed 's/^.*=//' > $TMPFILE
- fi
- done <src/template/.similar
- GUESS=`cat $TMPFILE`
- rm -f $TMPFILE
- if test "$GUESS"
- then TEMPLATE="$GUESS"
- else
- # Last chance ... maybe uname -s will match an entry.
- TEMPLATE=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- fi
-fi
- ])
-AC_MSG_RESULT($TEMPLATE)
-
-export TEMPLATE
-if test ! -f "src/template/$TEMPLATE"; then
- echo ""
- echo "$TEMPLATE does not exist"
- echo ""
- echo "Available Templates (select one using --with-template):"
- echo ""
- ls src/template
- echo ""
- exit
+# Pick right test-and-set (TAS) code. Most platforms have inline
+# assembler code in their port include file, so we just use a dummy
+# file here.
+tas_file=dummy.s
+need_tas=no
+case $template in
+ hpux) need_tas=yes; tas_file=hpux.s ;;
+ solaris_sparc) need_tas=yes; tas_file=solaris_sparc.s ;;
+ solaris_i386) need_tas=yes; tas_file=solaris_i386.s ;;
+esac
+
+if test "$need_tas" = yes ; then
+ AC_LINK_FILES([src/backend/port/tas/${tas_file}], [src/backend/port/tas.s])
+ TAS=tas.o
fi
+AC_SUBST(TAS)
-dnl Read the selected template file.
-dnl For reasons of backwards compatibility, lines of the form
-dnl IDENTIFIER: something
-dnl should be treated as variable assignments. However, we also want to
-dnl allow other shell commands in the template file (in case the file
-dnl needs to make conditional tests, etc). So, generate a temp file with
-dnl the IDENTIFIER: lines translated, then source it.
-[
-rm -f conftest.sh
-sed 's/^\([A-Za-z_]*\):\(.*\)$/\1="\2"/' "src/template/$TEMPLATE" >conftest.sh
-. ./conftest.sh
-rm -f conftest.sh
-]
-dnl
-dnl Add non-standard directories to the include path
-dnl
-AC_ARG_WITH(includes, [ --with-includes=DIRS add non-standard include paths],
-[if test x"$withval" = x"yes" || test x"$withval" = x"no" ; then
- AC_MSG_ERROR([You must supply an argument to the --with-includes option.])
-fi])
+##
+## Command line options
+##
-# SRCH_INC comes from the template file
-ac_save_IFS=$IFS
-IFS=':'
-for dir in $with_includes $SRCH_INC; do
- if test -d "$dir"; then
- INCLUDES="$INCLUDES -I$dir"
- else
- AC_MSG_WARN([*** Include directory $dir does not exist.])
- fi
-done
-IFS=$ac_save_IFS
-AC_SUBST(INCLUDES)
+#
+# Add non-standard directories to the include path
+#
+AC_ARG_WITH(includes, [ --with-includes=DIRS look for additional header files in DIRS],
+[
+ case $withval in
+ yes | no) AC_MSG_ERROR([You must supply an argument to the --with-includes option.]);;
+ esac
+])
-dnl
-dnl Add non-standard directories to the library search path
-dnl
-AC_ARG_WITH(libraries,
- [ --with-libraries=DIRS look for additional libraries in DIRS],
- [
- case "$withval" in
- "" | y | ye | yes | n | no)
- AC_MSG_ERROR([*** You must supply an argument to the --with-libraries option.])
- ;;
- esac
- LIBRARY_DIRS="$withval"
- ])
-AC_ARG_WITH(libs,
- [ --with-libs=DIRS alternate spelling of --with-libraries],
- [
- case "$withval" in
- "" | y | ye | yes | n | no)
- AC_MSG_ERROR([*** You must supply an argument to the --with-libs option.])
- ;;
- esac
- LIBRARY_DIRS="$withval"
- ])
-
-dnl LIBRARY_DIRS comes from command line, SRCH_LIB from template file.
-dnl Each can name one or more directories.
-if test "$LIBRARY_DIRS" -o "$SRCH_LIB"; then
- for dir in $LIBRARY_DIRS $SRCH_LIB; do
- if test -d "$dir"; then
- PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"
- else
- AC_MSG_WARN([*** Library directory $dir does not exist.])
- fi
- done
-fi
+#
+# Add non-standard directories to the library search path
+#
+AC_ARG_WITH(libraries, [ --with-libraries=DIRS look for additional libraries in DIRS],
+[
+ case $withval in
+ yes | no) AC_MSG_ERROR([You must supply an argument to the --with-libraries option.]);;
+ esac
+ LIBRARY_DIRS=$withval
+])
-##
-## Command line options
-##
+AC_ARG_WITH(libs, [ --with-libs=DIRS alternative spelling of --with-libraries],
+[
+ case $withval in
+ yes | no) AC_MSG_ERROR([You must supply an argument to the --with-libs option.]);;
+ esac
+ LIBRARY_DIRS=$withval
+])
#
@@ -236,7 +164,7 @@ AC_MSG_CHECKING([whether to build with locale support])
AC_ARG_ENABLE(locale, [ --enable-locale enable locale support],
[if test x"$enable_locale" != x"no" ; then
enable_locale=yes
- AC_DEFINE(USE_LOCALE, [], [Set to 1 if you want LOCALE support (--enable-locale)])
+ AC_DEFINE(USE_LOCALE, 1, [Set to 1 if you want LOCALE support (--enable-locale)])
fi],
[enable_locale=no])
AC_MSG_RESULT([$enable_locale])
@@ -249,7 +177,7 @@ AC_MSG_CHECKING([whether to build with Cyrillic recode support])
AC_ARG_ENABLE(recode, [ --enable-recode enable cyrillic recode support],
[if test x"$enable_recode" != x"no" ; then
enable_recode=yes
- AC_DEFINE(CYR_RECODE, [], [Set to 1 if you want cyrillic recode support (--enable-recode)])
+ AC_DEFINE(CYR_RECODE, 1, [Set to 1 if you want cyrillic recode support (--enable-recode)])
fi],
[enable_recode=no])
AC_MSG_RESULT([$enable_recode])
@@ -281,7 +209,7 @@ Or do not specify an argument to the option to use the default.]) ;;
AC_SUBST(MULTIBYTE)
if test "$enable_multibyte" = yes ; then
- AC_DEFINE(MULTIBYTE, [], [Set to 1 if you want to use multibyte characters (--enable-multibyte)])
+ AC_DEFINE(MULTIBYTE, 1, [Set to 1 if you want to use multibyte characters (--enable-multibyte)])
AC_MSG_RESULT([yes, default $MULTIBYTE])
else
AC_MSG_RESULT(no)
@@ -319,10 +247,12 @@ AC_DEFINE_UNQUOTED(DEF_MAXBACKENDS, [$with_maxbackends], [The default soft limit
#
+# C compiler
+#
+
# For historical reasons you can also use --with-CC to specify the C compiler
# to use, although the standard way to do this is to set the CC environment
# variable.
-#
if test "${with_CC+set}" = set; then
case $with_CC in
yes | no) AC_MSG_ERROR([You must supply an argument to the --with-CC option.]);;
@@ -330,18 +260,25 @@ if test "${with_CC+set}" = set; then
esac
fi
+# On AIX, default compiler to xlc.
+if test "$template" = aix && test -z "$CC" ; then CC=xlc; fi
-#
-# C compiler
-#
AC_PROG_CC
+# Read the template
+. "$srcdir/src/template/$template" || exit
+echo "using CFLAGS=$CFLAGS"
+# Check if the compiler still works with the template settings
+AC_PROG_CC_WORKS
AC_PROG_CPP
AC_PROG_GCC_TRADITIONAL
+
AC_SUBST(GCC)
+AC_SUBST(AROPT)
+AC_SUBST(SHARED_LIB)
+AC_SUBST(DLSUFFIX)
+AC_SUBST(DL_LIB)
-#
# Create compiler version string
-#
if test x"$GCC" = x"yes" ; then
cc_string="GCC `${CC} --version`"
else
@@ -350,6 +287,56 @@ fi
AC_DEFINE_UNQUOTED(PG_VERSION_STR, ["PostgreSQL $VERSION on $host, compiled by $cc_string"], [A canonical string containing the version number, platform, and C compiler])
+# --enable-debug adds -g to compiler flags
+# --disable-debug will forcefully remove it
+AC_MSG_CHECKING(setting debug compiler flag)
+AC_ARG_ENABLE(debug, [ --enable-debug build with debugging symbols (-g)],
+[
+ case $enableval in
+ yes) CFLAGS="$CFLAGS -g"
+ AC_MSG_RESULT(yes)
+ ;;
+ *) CFLAGS=`echo "$CFLAGS" | sed -e 's/ -g/ /g' -e 's/^-g//'`
+ AC_MSG_RESULT(no)
+ ;;
+ esac
+],
+[AC_MSG_RESULT(using default)])
+
+
+#
+# Include directories
+#
+ac_save_IFS=$IFS
+IFS=':'
+# SRCH_INC comes from the template file
+for dir in $with_includes $SRCH_INC; do
+ if test -d "$dir"; then
+ INCLUDES="$INCLUDES -I$dir"
+ else
+ AC_MSG_WARN([*** Include directory $dir does not exist.])
+ fi
+done
+IFS=$ac_save_IFS
+AC_SUBST(INCLUDES)
+
+
+#
+# Library directories
+#
+ac_save_IFS=$IFS
+IFS=':'
+# LIBRARY_DIRS comes from command line, SRCH_LIB from template file.
+for dir in $LIBRARY_DIRS $SRCH_LIB; do
+ if test -d "$dir"; then
+ PGSQL_LDFLAGS="$PGSQL_LDFLAGS -L$dir"
+ else
+ AC_MSG_WARN([*** Library directory $dir does not exist.])
+ fi
+done
+IFS=$ac_save_IFS
+
+
dnl We exclude tcl support unless user says --with-tcl
AC_MSG_CHECKING(setting USE_TCL)
@@ -364,9 +351,9 @@ AC_ARG_WITH(
],
[ USE_TCL=; USE_TK=; AC_MSG_RESULT(disabled) ]
)
+AC_SUBST(USE_TCL)
+AC_SUBST(USE_TK)
-export USE_TCL
-export USE_TK
dnl We see if the path to the TCL/TK configuration scripts is specified.
dnl This will override the use of tclsh to find the paths to search.
@@ -632,62 +619,26 @@ AC_ARG_ENABLE(
AC_MSG_RESULT(disabled)
)
-CPPFLAGS="$CPPFLAGS $INCLUDES"
-echo "- setting CPPFLAGS=$CPPFLAGS"
-
-LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
-echo "- setting LDFLAGS=$LDFLAGS"
-
-dnl --enable-debug adds -g to compiler flags
-dnl --disable-debug will forcefully remove it
-AC_MSG_CHECKING(setting debug compiler flag)
-AC_ARG_ENABLE(
- debug,
- [ --enable-debug build with debugging symbols (-g) ],
- [
- case "$enableval" in
- y | ye | yes)
- CFLAGS="$CFLAGS -g"
- AC_MSG_RESULT(enabled)
- ;;
- *)
- CFLAGS=`echo "$CFLAGS" | sed -e 's/ -g/ /g' | sed -e 's/^-g//'`
- AC_MSG_RESULT(disabled)
- ;;
- esac
- ],
- AC_MSG_RESULT(using default)
-)
# Assume system is ELF if it predefines __ELF__ as 1,
-# otherwise believe "elf" setting from check of host_os above.
+# otherwise believe host_os based default.
+case $host_os in
+ freebsd1*|freebsd2*) elf=yes;;
+esac
+
AC_EGREP_CPP(yes,
[#if __ELF__
yes
#endif
],
- ELF_SYS=true,
-[if test "X$elf" = "Xyes"
-then
- ELF_SYS=true
+[ELF_SYS=true],
+[if test "X$elf" = "Xyes" ; then
+ ELF_SYS=true
else
- ELF_SYS=
-fi
-])
-
+ ELF_SYS=
+fi])
AC_SUBST(ELF_SYS)
-AC_SUBST(PORTNAME)
-AC_SUBST(CPU)
-AC_SUBST(SRCDIR)
-AC_SUBST(LDFLAGS)
-AC_SUBST(AROPT)
-AC_SUBST(SHARED_LIB)
-AC_SUBST(CFLAGS)
-AC_SUBST(DLSUFFIX)
-AC_SUBST(DL_LIB)
-AC_SUBST(USE_TCL)
-AC_SUBST(USE_TK)
-AC_SUBST(WISH)
+
dnl
@@ -711,6 +662,13 @@ fi],
AC_SUBST(with_CXX)
+CPPFLAGS="$CPPFLAGS $INCLUDES"
+LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
+
+echo "using CPPFLAGS=$CPPFLAGS"
+echo "using LDFLAGS=$LDFLAGS"
+
+
# Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
@@ -858,19 +816,22 @@ PGAC_VAR_INT_TIMEZONE
AC_FUNC_ACCEPT_ARGTYPES
PGAC_FUNC_GETTIMEOFDAY_1ARG
-AC_MSG_CHECKING(for fcntl(F_SETLK))
-if test "$os" != linux ; then
-AC_TRY_LINK([#include <stdio.h>
-#include <fcntl.h>],
- [struct flock lck;
- lck.l_whence = SEEK_SET; lck.l_start = lck.l_len = 0;
- lck.l_type = F_WRLCK;
- fcntl(0, F_SETLK, &lck);],
- [AC_DEFINE(HAVE_FCNTL_SETLK) AC_MSG_RESULT(yes)],
- AC_MSG_RESULT(no))
-else
- AC_MSG_RESULT([broken on Linux])
-fi
+AC_MSG_CHECKING([for fcntl(F_SETLK)])
+case $host_os in
+ linux*) AC_MSG_RESULT([broken on Linux]) ;;
+ *)
+AC_TRY_LINK(
+[#include <stdio.h>
+#include <fcntl.h>
+],
+[struct flock lck;
+lck.l_whence = SEEK_SET; lck.l_start = lck.l_len = 0;
+lck.l_type = F_WRLCK;
+fcntl(0, F_SETLK, &lck);],
+[AC_DEFINE(HAVE_FCNTL_SETLK) AC_MSG_RESULT(yes)],
+[AC_MSG_RESULT(no)])
+ ;;
+esac
AC_CHECK_FUNCS([fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid])
@@ -976,7 +937,7 @@ AC_CHECK_FUNC(cbrt,
# On HPUX 9, rint() is not in regular libm.a but in /lib/pa1.1/libm.a;
# this hackery with HPUXMATHLIB allows us to cope.
HPUXMATHLIB=""
-case "$host_cpu" in
+case $host_cpu in
hppa1.1)
if [[ -r /lib/pa1.1/libm.a ]] ; then
HPUXMATHLIB="-L /lib/pa1.1 -lm"
@@ -1244,6 +1205,7 @@ then
AC_PATH_PROG(WISH, wish)
fi
fi
+AC_SUBST(WISH)
USE_X=$USE_TK
diff --git a/src/include/port/bsd.h b/src/include/port/openbsd.h
index dc01930325..dc01930325 100644
--- a/src/include/port/bsd.h
+++ b/src/include/port/openbsd.h
diff --git a/src/include/port/alpha.h b/src/include/port/osf.h
index 90c5a8af6c..90c5a8af6c 100644
--- a/src/include/port/alpha.h
+++ b/src/include/port/osf.h
diff --git a/src/makefiles/Makefile.bsd b/src/makefiles/Makefile.openbsd
index 14ebbfecf3..14ebbfecf3 100644
--- a/src/makefiles/Makefile.bsd
+++ b/src/makefiles/Makefile.openbsd
diff --git a/src/makefiles/Makefile.alpha b/src/makefiles/Makefile.osf
index a9e8e948ec..a9e8e948ec 100644
--- a/src/makefiles/Makefile.alpha
+++ b/src/makefiles/Makefile.osf
diff --git a/src/template/.similar b/src/template/.similar
deleted file mode 100644
index f19ce14d03..0000000000
--- a/src/template/.similar
+++ /dev/null
@@ -1,34 +0,0 @@
-# Format of this file is expr-style-regular-expression=templatefilename
-alpha[a-z0-9]*-unknown-linux-gnu=linux_alpha
-alpha[a-z0-9]*-dec-osf=alpha_cc
-arm-unknown-linux-gnu=linux_arm
-hppa[0-9.]*-hp-hpux=hpux_cc
-hppa1.1-stratus-sysv4=svr4
-i.86-next-nextstep3=nextstep
-i.86-pc-bsdi2.0=bsdi_2.0
-i.86-pc-bsdi2.1=bsdi_2.1
-i.86-pc-bsdi3=bsdi_2.1
-i.86-pc-bsdi4=bsdi_4.0
-i.86-pc-cygwin=cygwin32
-i.86-pc-linux-gnu=linux_i386
-i.86-pc-sco3.2v=sco
-i.86-pc-solaris=solaris_i386_gcc
-i.86-pc-sunos5=solaris_i386_gcc
-i.86-unknown-freebsd=freebsd
-i.86-unknown-netbsd=netbsd
-m68k-unknown-linux=linux_m68k
-mips-pc-linux-gnu=linux_mips
-mips-sgi-irix=irix5
-mipsel-unknown-linux-gnu=linux_mips
-powerpc-ibm-aix3.2.5=aix_325
-powerpc-ibm-aix4.1=aix_41
-powerpc-ibm-aix4.2=aix_42
-powerpc-ibm-aix4.3=aix_42
-powerpc-unknown-linux-gnu=linux_ppc
-rs6000-ibm-aix4.2=aix_42
-rs6000-ibm-aix4.3=aix_42
-sparc-sun-solaris=solaris_sparc_gcc
-sparc-sun-sunos4=sunos4_gcc
-sparc-sun-sunos5=solaris_sparc_gcc
-sparc-unknown-bsdi4=bsdi_4.0_sparc
-sparc-unknown-linux-gnu=linux_sparc
diff --git a/src/template/aix b/src/template/aix
new file mode 100644
index 0000000000..8b81c6e154
--- /dev/null
+++ b/src/template/aix
@@ -0,0 +1,23 @@
+AROPT=crs
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+ CFLAGS=-pipe
+ CXXFLAGS=-pipe
+ SHARED_LIB=-lc
+else # not GCC
+ case $host_os in
+ aix3.2.5)
+ CFLAGS='-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg'
+ SHARED_LIB='-e _nostart -lc'
+ ;;
+ aix4.1)
+ CFLAGS='-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero'
+ SHARED_LIB='-bnoentry -lc'
+ ;;
+ aix4.2 | aix4.3)
+ CFLAGS='-qmaxmem=16384 -qhalt=w -qsrcmsg -qlanglvl=extended -qlonglong'
+ SHARED_LIB='-lc'
+ ;;
+ esac
+fi # not GCC
diff --git a/src/template/aix_325 b/src/template/aix_325
deleted file mode 100644
index 36c468b2b5..0000000000
--- a/src/template/aix_325
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg
-SHARED_LIB:-e _nostart -lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:xlc
diff --git a/src/template/aix_41 b/src/template/aix_41
deleted file mode 100644
index 54f0dd0992..0000000000
--- a/src/template/aix_41
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero
-SHARED_LIB:-bnoentry -lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:xlc
diff --git a/src/template/aix_42 b/src/template/aix_42
deleted file mode 100644
index ff4ad9a689..0000000000
--- a/src/template/aix_42
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-qmaxmem=16384 -qhalt=w -qsrcmsg -qlanglvl=extended -qlonglong
-SHARED_LIB:-lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:xlc
diff --git a/src/template/aix_gcc b/src/template/aix_gcc
deleted file mode 100644
index 3a77172133..0000000000
--- a/src/template/aix_gcc
+++ /dev/null
@@ -1,9 +0,0 @@
-AROPT:crs
-CFLAGS:-pipe
-CXXFLAGS:-pipe
-SHARED_LIB:-lc
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:gcc
diff --git a/src/template/alpha_gcc b/src/template/alpha_gcc
deleted file mode 100644
index 5f53298f71..0000000000
--- a/src/template/alpha_gcc
+++ /dev/null
@@ -1,14 +0,0 @@
-AROPT:crs
-# NOFIXADE disallows unaligned access.
-# on Ultrix and OSF/1 it invokes an explicit syscall.
-# on HP-UX it turns off certain compiler options.
-# This is defined here because a bunch of clients include tmp/c.h,
-# which is where the work is done on HP-UX. It only affects the
-# backend on Ultrix and OSF/1.
-CC:gcc
-CFLAGS:-D__alpha__ -DNOFIXADE
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/bsdi b/src/template/bsdi
new file mode 100644
index 0000000000..f57663ddb0
--- /dev/null
+++ b/src/template/bsdi
@@ -0,0 +1,22 @@
+AROPT=cq
+CFLAGS='-O2 -pipe'
+
+case $host_cpu in
+ i?86) CFLAGS="$CFLAGS -m486";;
+esac
+
+case $host_os in
+ bsdi2.0) CFLAGS="$CFLAGS -DPRE_BSDI_2_1";;
+esac
+
+case $host_os in
+ bsdi2.0 | bsdi2.1 | bsdi3)
+ SHARED_LIB=
+ DLSUFFIX=.o
+ CC=gcc2
+ ;;
+ bsdi4)
+ SHARED_LIB=-fpic
+ DLSUFFIX=.so
+ ;;
+esac
diff --git a/src/template/bsdi_2.0 b/src/template/bsdi_2.0
deleted file mode 100644
index bcef190cf6..0000000000
--- a/src/template/bsdi_2.0
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -m486 -pipe -DPRE_BSDI_2_1
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.o
-CC:gcc2
diff --git a/src/template/bsdi_2.1 b/src/template/bsdi_2.1
deleted file mode 100644
index 8a15d25aac..0000000000
--- a/src/template/bsdi_2.1
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -m486 -pipe
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.o
-CC:gcc2
diff --git a/src/template/bsdi_4.0 b/src/template/bsdi_4.0
deleted file mode 100644
index 5621715ef4..0000000000
--- a/src/template/bsdi_4.0
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -m486 -pipe
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:gcc
diff --git a/src/template/bsdi_4.0_sparc b/src/template/bsdi_4.0_sparc
deleted file mode 100644
index 2c861be120..0000000000
--- a/src/template/bsdi_4.0_sparc
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:-O2 -pipe
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:gcc
diff --git a/src/template/cygwin32 b/src/template/cygwin32
deleted file mode 100644
index be6e4c28cf..0000000000
--- a/src/template/cygwin32
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:
-ALL:
-SRCH_INC:/usr/local/include
-SRCH_LIB:/usr/local/lib
-DLSUFFIX:.dll
-LIBS:-lcygipc
diff --git a/src/template/dgux b/src/template/dgux
index a35179872d..c086419841 100644
--- a/src/template/dgux
+++ b/src/template/dgux
@@ -1,8 +1,4 @@
-AROPT:crs
-CFLAGS:
-LIBS:-lsocket -lnsl
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=
+SHARED_LIB=-fpic
+DLSUFFIX=.so
diff --git a/src/template/freebsd b/src/template/freebsd
index fd8ae769cd..ba10deb6b2 100644
--- a/src/template/freebsd
+++ b/src/template/freebsd
@@ -1,6 +1,4 @@
-AROPT:cq
-SHARED_LIB:-fpic -DPIC
-CFLAGS:-O2 -m486 -pipe
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=cq
+SHARED_LIB='-fpic -DPIC'
+CFLAGS='-O2 -m486 -pipe'
+DLSUFFIX=.so
diff --git a/src/template/generic b/src/template/generic
deleted file mode 100644
index 5f8e51d313..0000000000
--- a/src/template/generic
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/hpux b/src/template/hpux
new file mode 100644
index 0000000000..bc3ac1ced8
--- /dev/null
+++ b/src/template/hpux
@@ -0,0 +1,14 @@
+AROPT=crs
+DLSUFFIX=.sl
+
+if test "$GCC" = yes ; then
+ CFLAGS=-O2
+ SHARED_LIB=-fPIC
+ DL_LIB=/usr/lib/libdld.sl
+ CCC=g++
+else
+ CFLAGS='-Wl,-E -Ae'
+ SHARED_LIB=+z
+ CPP='cc -E -Ae'
+ CCC=aCC
+fi
diff --git a/src/template/hpux_cc b/src/template/hpux_cc
deleted file mode 100644
index f1f5eaa07a..0000000000
--- a/src/template/hpux_cc
+++ /dev/null
@@ -1,11 +0,0 @@
-AROPT:crs
-CFLAGS:-Wl,-E -Ae
-SHARED_LIB:+z
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.sl
-CC:cc
-CPP:cc -E -Ae
-# Make aCC be first C++ compiler name tried...
-CCC:aCC
diff --git a/src/template/hpux_gcc b/src/template/hpux_gcc
deleted file mode 100644
index 4e78d420e7..0000000000
--- a/src/template/hpux_gcc
+++ /dev/null
@@ -1,10 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DL_LIB:/usr/lib/libdld.sl
-DLSUFFIX:.sl
-CC:gcc
-CCC:g++
diff --git a/src/template/irix5 b/src/template/irix5
index 5f8e51d313..c1652186c4 100644
--- a/src/template/irix5
+++ b/src/template/irix5
@@ -1,7 +1,4 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=
+SHARED_LIB=
+DLSUFFIX=.so
diff --git a/src/template/linux b/src/template/linux
new file mode 100644
index 0000000000..2c823be7e5
--- /dev/null
+++ b/src/template/linux
@@ -0,0 +1,9 @@
+AROPT=crs
+CFLAGS=-O2
+SHARED_LIB=-fpic
+DLSUFFIX=.so
+
+case $host_cpu in
+ mips*) CFLAGS="$CFLAGS -mips2";;
+ alpha*) CPU=alpha;;
+esac
diff --git a/src/template/linux_alpha b/src/template/linux_alpha
deleted file mode 100644
index 93e9be371d..0000000000
--- a/src/template/linux_alpha
+++ /dev/null
@@ -1,9 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CPU:alpha
-
diff --git a/src/template/linux_arm b/src/template/linux_arm
deleted file mode 100644
index 5abf05c96b..0000000000
--- a/src/template/linux_arm
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/linux_i386 b/src/template/linux_i386
deleted file mode 100644
index 5abf05c96b..0000000000
--- a/src/template/linux_i386
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/linux_m68k b/src/template/linux_m68k
deleted file mode 100644
index 5abf05c96b..0000000000
--- a/src/template/linux_m68k
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/linux_mips b/src/template/linux_mips
deleted file mode 100644
index 73e1d73a1f..0000000000
--- a/src/template/linux_mips
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2 -mips2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/linux_ppc b/src/template/linux_ppc
deleted file mode 100755
index 5abf05c96b..0000000000
--- a/src/template/linux_ppc
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/linux_sparc b/src/template/linux_sparc
deleted file mode 100644
index 5abf05c96b..0000000000
--- a/src/template/linux_sparc
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:-O2
-SHARED_LIB:-fpic
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/netbsd b/src/template/netbsd
index ded2d63231..38fa1df795 100644
--- a/src/template/netbsd
+++ b/src/template/netbsd
@@ -1,6 +1,4 @@
-AROPT:cq
-SHARED_LIB:-fpic -DPIC
-CFLAGS:-O2 -pipe
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=cq
+SHARED_LIB='-fpic -DPIC'
+CFLAGS='-O2 -pipe'
+DLSUFFIX=.so
diff --git a/src/template/nextstep b/src/template/nextstep
index c3269f2744..c8b14f4d8b 100644
--- a/src/template/nextstep
+++ b/src/template/nextstep
@@ -1,7 +1,4 @@
-AROPT:rc
-CFLAGS:
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.o
+AROPT=rc
+CFLAGS=
+SHARED_LIB=
+DLSUFFIX=.o
diff --git a/src/template/openbsd b/src/template/openbsd
index ded2d63231..38fa1df795 100644
--- a/src/template/openbsd
+++ b/src/template/openbsd
@@ -1,6 +1,4 @@
-AROPT:cq
-SHARED_LIB:-fpic -DPIC
-CFLAGS:-O2 -pipe
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=cq
+SHARED_LIB='-fpic -DPIC'
+CFLAGS='-O2 -pipe'
+DLSUFFIX=.so
diff --git a/src/template/alpha_cc b/src/template/osf
index 3ddf1133a0..aa1a84317b 100644
--- a/src/template/alpha_cc
+++ b/src/template/osf
@@ -1,17 +1,21 @@
-AROPT:crs
+AROPT=crs
+
# NOFIXADE disallows unaligned access.
# on Ultrix and OSF/1 it invokes an explicit syscall.
# on HP-UX it turns off certain compiler options.
# This is defined here because a bunch of clients include tmp/c.h,
# which is where the work is done on HP-UX. It only affects the
# backend on Ultrix and OSF/1.
-CC:cc
-CFLAGS:-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000
-LDFLAGS='-rpath $(LIBDIR)'
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CCC:cxx
-CXXFLAGS:-D__alpha__ -DNOFIXADE -O4 -Olimit 2000
+
+if test "$GCC" = yes ; then
+ CFLAGS='-D__alpha__ -DNOFIXADE'
+ CCC=g++
+else
+ CFLAGS='-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000'
+ LDFLAGS='-rpath $(libdir)'
+ CCC=cxx
+ CXXFLAGS='-D__alpha__ -DNOFIXADE -O4 -Olimit 2000'
+fi
+
+DLSUFFIX=.so
+SHARED_LIB=
diff --git a/src/template/qnx b/src/template/qnx
deleted file mode 100644
index ad3ad163f6..0000000000
--- a/src/template/qnx
+++ /dev/null
@@ -1,9 +0,0 @@
-AROPT:cr
-CFLAGS:
-LIBS:-lunix
-SHARED_LIB:
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CXXFLAGS:-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++
diff --git a/src/template/qnx4 b/src/template/qnx4
new file mode 100644
index 0000000000..001f1715c9
--- /dev/null
+++ b/src/template/qnx4
@@ -0,0 +1,6 @@
+AROPT=cr
+CFLAGS=
+LIBS=-lunix
+SHARED_LIB=
+DLSUFFIX=.so
+CXXFLAGS=-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++
diff --git a/src/template/sco b/src/template/sco
index b2c8751b2c..8de1c8c271 100644
--- a/src/template/sco
+++ b/src/template/sco
@@ -1,8 +1,5 @@
-AROPT:cq
-CFLAGS:
-SHARED_LIB:-K PIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc -b elf
+AROPT=cq
+CFLAGS=
+SHARED_LIB='-K PIC'
+DLSUFFIX=.so
+CC="$CC -b elf"
diff --git a/src/template/solaris_i386 b/src/template/solaris_i386
new file mode 100644
index 0000000000..c9e70260c1
--- /dev/null
+++ b/src/template/solaris_i386
@@ -0,0 +1,11 @@
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+ AROPT=crs
+ CFLAGS=
+ SHARED_LIB=-fPIC
+else
+ AROPT=cq
+ CFLAGS=
+ SHARED_LIB=-KPIC
+fi
diff --git a/src/template/solaris_i386_cc b/src/template/solaris_i386_cc
deleted file mode 100644
index a665158068..0000000000
--- a/src/template/solaris_i386_cc
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cq
-CFLAGS:
-SHARED_LIB:-KPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc
diff --git a/src/template/solaris_i386_gcc b/src/template/solaris_i386_gcc
deleted file mode 100644
index 43f3f06ffb..0000000000
--- a/src/template/solaris_i386_gcc
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/solaris_sparc b/src/template/solaris_sparc
new file mode 100644
index 0000000000..1863d97c81
--- /dev/null
+++ b/src/template/solaris_sparc
@@ -0,0 +1,10 @@
+AROPT=crs
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+ CFLAGS=
+ SHARED_LIB=-fPIC
+else
+ CFLAGS='-Xa -v -D__sparc__ -D__sun__'
+ SHARED_LIB=-KPIC
+fi
diff --git a/src/template/solaris_sparc_cc b/src/template/solaris_sparc_cc
deleted file mode 100644
index da7d77379b..0000000000
--- a/src/template/solaris_sparc_cc
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:crs
-CFLAGS:-Xa -v -D__sparc__ -D__sun__
-SHARED_LIB:-KPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc
diff --git a/src/template/solaris_sparc_gcc b/src/template/solaris_sparc_gcc
deleted file mode 100644
index 43f3f06ffb..0000000000
--- a/src/template/solaris_sparc_gcc
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/sunos4 b/src/template/sunos4
new file mode 100644
index 0000000000..6c26fabf29
--- /dev/null
+++ b/src/template/sunos4
@@ -0,0 +1,10 @@
+AROPT=cr
+DLSUFFIX=.so
+
+if test "$GCC" = yes ; then
+ CFLAGS=
+ SHARED_LIB=-fPIC
+else
+ CFLAGS=
+ SHARED_LIB=-PIC
+fi
diff --git a/src/template/sunos4_cc b/src/template/sunos4_cc
deleted file mode 100644
index dc2580bca8..0000000000
--- a/src/template/sunos4_cc
+++ /dev/null
@@ -1,8 +0,0 @@
-AROPT:cr
-CFLAGS:
-SHARED_LIB:-PIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc
diff --git a/src/template/sunos4_gcc b/src/template/sunos4_gcc
deleted file mode 100644
index 73ae40585d..0000000000
--- a/src/template/sunos4_gcc
+++ /dev/null
@@ -1,7 +0,0 @@
-AROPT:cr
-CFLAGS:
-SHARED_LIB:-fPIC
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
diff --git a/src/template/svr4 b/src/template/svr4
index 26d5c0ca39..c1652186c4 100644
--- a/src/template/svr4
+++ b/src/template/svr4
@@ -1,7 +1,4 @@
-AROPT:crs
-CFLAGS:
-SHARED_LIB:
-ALL:+W0
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=
+SHARED_LIB=
+DLSUFFIX=.so
diff --git a/src/template/ultrix4 b/src/template/ultrix4
index 6b87bc3106..d708414ec4 100644
--- a/src/template/ultrix4
+++ b/src/template/ultrix4
@@ -1,7 +1,4 @@
-AROPT:crs
-CFLAGS:-DNOFIXADE
-SHARED_LIB:-G 0
-ALL:
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
+AROPT=crs
+CFLAGS=-DNOFIXADE
+SHARED_LIB='-G 0'
+DLSUFFIX=.so
diff --git a/src/template/univel b/src/template/univel
index 680d3bd9b6..8bc70f1ae9 100644
--- a/src/template/univel
+++ b/src/template/univel
@@ -1,8 +1,5 @@
-AROPT:crs
-CFLAGS:-v -O -K i486,host,inline,loop_unroll -Dsvr4
-SHARED_LIB:-K PIC
-SRCH_INC:
-SRCH_LIB:
-DLSUFFIX:.so
-CC:cc
-LIBS:-lc89
+AROPT=crs
+CFLAGS='-v -O -K i486,host,inline,loop_unroll -Dsvr4'
+SHARED_LIB='-K PIC'
+DLSUFFIX=.so
+LIBS=-lc89
diff --git a/src/template/unixware b/src/template/unixware
index 976b5b9541..bf9c4b5d74 100644
--- a/src/template/unixware
+++ b/src/template/unixware
@@ -1,7 +1,6 @@
-AROPT:crs
-CFLAGS:-O -K i486,host,inline,loop_unroll,alloca -Dsvr4
-SHARED_LIB:-K PIC
-SRCH_INC:/opt/include
-SRCH_LIB:/opt/lib
-DLSUFFIX:.so
-CC:cc
+AROPT=crs
+CFLAGS='-O -K i486,host,inline,loop_unroll,alloca -Dsvr4'
+SHARED_LIB='-K PIC'
+SRCH_INC='/opt/include'
+SRCH_LIB='/opt/lib'
+DLSUFFIX=.so
diff --git a/src/template/win b/src/template/win
new file mode 100644
index 0000000000..d5734c0a8a
--- /dev/null
+++ b/src/template/win
@@ -0,0 +1,6 @@
+AROPT=crs
+CFLAGS=-O2
+SRCH_INC=/usr/local/include
+SRCH_LIB=/usr/local/lib
+DLSUFFIX=.dll
+LIBS=-lcygipc