--- sql/pgsql/configure 2001/09/25 07:10:06 1.2 +++ sql/pgsql/configure 2002/02/08 10:42:31 1.5 @@ -14,9 +14,9 @@ ac_default_prefix=/usr/local ac_help="$ac_help --with-pgsql-inc[=DIR] DIR is the PgSQL includes directory" ac_help="$ac_help - --enable-shared[=PKGS] build shared libraries [default=yes]" + --enable-static[=PKGS] build static libraries [default=no]" ac_help="$ac_help - --enable-static[=PKGS] build static libraries [default=yes]" + --enable-shared[=PKGS] build shared libraries [default=yes]" ac_help="$ac_help --enable-fast-install[=PKGS] optimize for fast installation [default=yes]" ac_help="$ac_help @@ -701,9 +701,9 @@ else fi -PACKAGE=parser3pgsqlclient +PACKAGE=parser3pgsql -VERSION=3.0g +VERSION=3.0b if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1084,50 +1084,50 @@ fi -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" +# Check whether --enable-static or --disable-static was given. +if test "${enable_static+set}" = set; then + enableval="$enable_static" p=${PACKAGE-default} case "$enableval" in -yes) enable_shared=yes ;; -no) enable_shared=no ;; +yes) enable_static=yes ;; +no) enable_static=no ;; *) - enable_shared=no + enable_static=no # Look at the argument we got. We use all the common list separators. IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," for pkg in $enableval; do if test "X$pkg" = "X$p"; then - enable_shared=yes + enable_static=yes fi done IFS="$ac_save_ifs" ;; esac else - enable_shared=yes + enable_static=no fi -# Check whether --enable-static or --disable-static was given. -if test "${enable_static+set}" = set; then - enableval="$enable_static" +# Check whether --enable-shared or --disable-shared was given. +if test "${enable_shared+set}" = set; then + enableval="$enable_shared" p=${PACKAGE-default} case "$enableval" in -yes) enable_static=yes ;; -no) enable_static=no ;; +yes) enable_shared=yes ;; +no) enable_shared=no ;; *) - enable_static=no + enable_shared=no # Look at the argument we got. We use all the common list separators. IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," for pkg in $enableval; do if test "X$pkg" = "X$p"; then - enable_static=yes + enable_shared=yes fi done IFS="$ac_save_ifs" ;; esac else - enable_static=yes + enable_shared=yes fi # Check whether --enable-fast-install or --disable-fast-install was given. @@ -1810,22 +1810,23 @@ echo "$ac_t""$CXXCPP" 1>&6 for ac_hdr in stdio.h \ stdlib.h \ -string.h +string.h \ +setjmp.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1819: checking for $ac_hdr" >&5 +echo "configure:1820: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1830: \"$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* @@ -1854,12 +1855,12 @@ done echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1858: checking for ANSI C header files" >&5 +echo "configure:1859: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1867,7 +1868,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1872: \"$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* @@ -1884,7 +1885,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1902,7 +1903,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1923,7 +1924,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1961,12 +1962,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1965: checking for size_t" >&5 +echo "configure:1966: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS