--- parser3/configure 2003/04/02 10:50:53 1.66.2.5.2.3 +++ parser3/configure 2003/07/24 11:31:18 1.67 @@ -859,7 +859,6 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking Speeds up one-time builds --enable-dependency-tracking Do not reject slow dependency extractors - --enable-assertions to enable assertions --disable-safe-mode to enable reading and executing files belonging to group+user other then effective --disable-execs to disable any execs @@ -868,6 +867,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-assertions to enable assertions --with-charsets=CHARSET,CHARSET,... Enables charsets in root config (windows-1251, windows-1250 windows-1257 koi8-r; Default is windows-1251) --with-mysql-client=mysqlclientlib?withparams @@ -3558,24 +3558,21 @@ esac -# Check whether --enable-assertions or --disable-assertions was given. -if test "${enable_assertions+set}" = set; then - enableval="$enable_assertions" - ASSERTIONS_MODE=$enableval - - -fi; -if test "$ASSERTIONS_MODE" = "yes"; then - { echo "$as_me:$LINENO: WARNING: enabling assertions" >&5 +# Check whether --with-assertions or --without-assertions was given. +if test "${with_assertions+set}" = set; then + withval="$with_assertions" + { echo "$as_me:$LINENO: WARNING: enabling assertions" >&5 echo "$as_me: WARNING: enabling assertions" >&2;} + else cat >>confdefs.h <<\_ACEOF #define NDEBUG _ACEOF -fi + +fi; # Check whether --enable-safe-mode or --disable-safe-mode was given. if test "${enable_safe_mode+set}" = set; then @@ -6087,7 +6084,6 @@ fi - for ac_func in flock \ _locking \ fcntl \ @@ -6096,7 +6092,7 @@ ftruncate \ getrusage \ gettimeofday \ crypt \ -sigsetjmp siglongjmp +siglongjmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -6181,6 +6177,63 @@ fi done + +pa_func=sigsetjmp +echo "$as_me:$LINENO: checking for (maybe built-in) function $pa_func" >&5 +echo $ECHO_N "checking for (maybe built-in) function $pa_func... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef HAVE_SETJMP_H +# include +#endif + +int +main () +{ + + $pa_func(0,0); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$pa_func" | $as_tr_cpp` 1 +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'