--- parser3/configure 2003/02/03 15:46:29 1.66.2.2 +++ parser3/configure 2003/03/12 14:13:41 1.66.2.4 @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE P3S build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB YACC CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE commentcharset_windows1251 commentcharset_windows1250 commentcharset_windows1257 commentcharset_koi8r dll_extension mysql_client pgsql_client oracle_client DO_NOT_LINK_LIBSTDCPP_TRUE DO_NOT_LINK_LIBSTDCPP_FALSE XML_INCLUDES XML_LIBS MIME_INCLUDES MIME_LIBS APACHE13 COMPILE_APACHE13_MODULE_TRUE COMPILE_APACHE13_MODULE_FALSE INCLTDL LIBLTDL subdirs LIBADD_DL CPP EGREP APACHE_LIBS charsetsdir sqldriversdir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE P3S build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB YACC CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE commentcharset_windows1251 commentcharset_windows1250 commentcharset_windows1257 commentcharset_koi8r dll_extension mysql_client pgsql_client oracle_client CPP_LIBS XML_INCLUDES XML_LIBS MIME_INCLUDES MIME_LIBS APACHE13 COMPILE_APACHE13_MODULE_TRUE COMPILE_APACHE13_MODULE_FALSE INCLTDL LIBLTDL subdirs LIBADD_DL CPP EGREP charsetsdir sqldriversdir LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -859,9 +859,9 @@ 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 - --disable-safe-mode to enable reading and executing + --disable-safe-mode to enable reading and executing files belonging to group+user other then effective - --disable-execs to disable any execs + --disable-execs to disable any execs (file::exec, file::cgi, unix mail:send) --disable-string-origins to switch off string origin tracking @@ -878,9 +878,8 @@ Optional Packages: Oracle client dynamic library --with-pathlink=LKEY put dynamic libraries paths to binary using linker key (-R, -rpath-link) - --with-link-stdcpp=PATH to directory with libstdc++ - --without-link-stdcpp to disable libstdc++ linkage, - if you belive you do not need one + --with-dynamic-stdcpp link libstdc++ dynamically + by default, libstdc++ is linked statically --with-sjlj-exceptions enable simple 'throw' from dynamic library --with-glib-config=FILE FILE is glib library configuration file (search for glib*-config) @@ -889,7 +888,7 @@ Optional Packages: --with-static-xml=D D is the directory where Gnome XML libraries are installed (static libs) --with-shared-mailreceive=D is the directory where - Gnome MIME library is installed (shared lib) + Gnome MIME library is installed (shared lib) --with-static-mailreceive=D is the directory where Gnome MIME library is installed (static lib) \"--with-sendmail=COMMAND\" forces this command to send mail. @@ -1709,8 +1708,8 @@ echo "/* edit configure.in to change ver echo "#define PARSER_VERSION \"$PARSER_VERSION\"" >> $srcdir/src/include/pa_version.h.new cmp $srcdir/src/include/pa_version.h.new $srcdir/src/include/pa_version.h >/dev/null 2>&1 if test $? -ne 0 ; then - rm -f $srcdir/src/include/pa_version.h && mv $srcdir/src/include/pa_version.h.new $srcdir/src/include/pa_version.h && \ - echo Updated $srcdir/src/include/pa_version.h + rm -f $srcdir/src/include/pa_version.h && mv $srcdir/src/include/pa_version.h.new $srcdir/src/include/pa_version.h && \ + echo Updated $srcdir/src/include/pa_version.h else rm -f $srcdir/src/include/pa_version.h.new fi @@ -2048,19 +2047,19 @@ done test -n "$YACC" || YACC="yacc" if test "$YACC" != "bison -y"; then - { echo "$as_me:$LINENO: WARNING: to regenerate Parser grammar YOU WOULD NEED BISON" >&5 + { echo "$as_me:$LINENO: WARNING: to regenerate Parser grammar YOU WOULD NEED BISON" >&5 echo "$as_me: WARNING: to regenerate Parser grammar YOU WOULD NEED BISON" >&2;} else - echo "$as_me:$LINENO: checking bison version" >&5 + echo "$as_me:$LINENO: checking bison version" >&5 echo $ECHO_N "checking bison version... $ECHO_C" >&6 - oldIFS=$IFS; IFS=. - set `bison -V | sed -e 's/^GNU Bison version //'` - IFS=$oldIFS - if test "$1" = "1" -a "$2" -lt "25"; then - { echo "$as_me:$LINENO: WARNING: Bison 1.25 or newer needed to regenerate Parser compiler (found $1.$2)." >&5 + oldIFS=$IFS; IFS=. + set `bison -V | sed -e 's/^GNU Bison version //' -e 's/^bison (GNU Bison) //' -e 's/$/./'` + IFS=$oldIFS + if test "$1" = "1" -a "$2" -lt "25"; then + { echo "$as_me:$LINENO: WARNING: Bison 1.25 or newer needed to regenerate Parser compiler (found $1.$2)." >&5 echo "$as_me: WARNING: Bison 1.25 or newer needed to regenerate Parser compiler (found $1.$2)." >&2;} - fi - echo "$as_me:$LINENO: result: $1.$2 (ok)" >&5 + fi + echo "$as_me:$LINENO: result: $1.$2 (ok)" >&5 echo "${ECHO_T}$1.$2 (ok)" >&6 fi @@ -3557,7 +3556,7 @@ esac if test "${enable_safe_mode+set}" = set; then enableval="$enable_safe_mode" - SAFE_MODE=$enableval + SAFE_MODE=$enableval fi; @@ -3677,13 +3676,13 @@ echo "$as_me:$LINENO: checking for dynam echo $ECHO_N "checking for dynamic-link library extension... $ECHO_C" >&6 case "$host_os" in hpux9* | hpux10* | hpux11*) - dll_extension=sl - ;; + dll_extension=sl + ;; cygwin) - dll_extension=dll - ;; + dll_extension=dll + ;; *) - dll_extension=so + dll_extension=so esac echo "$as_me:$LINENO: result: $dll_extension" >&5 echo "${ECHO_T}$dll_extension" >&6 @@ -3783,39 +3782,21 @@ if test "${with_pathlink+set}" = set; th fi; -# Check whether --with-link-stdcpp or --without-link-stdcpp was given. -if test "${with_link_stdcpp+set}" = set; then - withval="$with_link_stdcpp" - -LIBSTDCPP_PATH=$withval -if test "$LIBSTDCPP_PATH" = "no"; then - { echo "$as_me:$LINENO: WARNING: disabling libstdc++ linkage" >&5 -echo "$as_me: WARNING: disabling libstdc++ linkage" >&2;} -else - if test -z "$LD_PATHLINK"; then - { { echo "$as_me:$LINENO: error: when using --with-link-stdcpp one must specify --with-pathlink" >&5 -echo "$as_me: error: when using --with-link-stdcpp one must specify --with-pathlink" >&2;} - { (exit 1); exit 1; }; } - fi - LIBS="$LIBS -Wl,$LD_PATHLINK -Wl,$LIBSTDCPP_PATH" -fi - -else - #pseudo path, meaning still link libstdcpp. value needed to trick next _CONDITIONAL -LIBSTDCPP_PATH=" " - -fi; +# Check whether --with-dynamic-stdcpp or --without-dynamic-stdcpp was given. +if test "${with_dynamic_stdcpp+set}" = set; then + withval="$with_dynamic_stdcpp" + { echo "$as_me:$LINENO: WARNING: libstdc++ will be linked dynamically: this is probably incompatible with other platforms" >&5 +echo "$as_me: WARNING: libstdc++ will be linked dynamically: this is probably incompatible with other platforms" >&2;} + # this is for apache, it's linked with gcc and need to know + # and it would not harm linking with c++ toolchain + CPP_LIBS="-lstdc++" -if test "$LIBSTDCPP_PATH" = "no"; then - DO_NOT_LINK_LIBSTDCPP_TRUE= - DO_NOT_LINK_LIBSTDCPP_FALSE='#' else - DO_NOT_LINK_LIBSTDCPP_TRUE='#' - DO_NOT_LINK_LIBSTDCPP_FALSE= -fi + CPP_LIBS="-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic" +fi; @@ -3844,16 +3825,16 @@ fi; if test "${with_shared_xml+set}" = set; then withval="$with_shared_xml" - GNOME_XML=$withval - XMLBIN="$GNOME_XML/bin" - XMLINC="$GNOME_XML/include" - XMLLIB="$GNOME_XML/lib" + GNOME_XML=$withval + XMLBIN="$GNOME_XML/bin" + XMLINC="$GNOME_XML/include" + XMLLIB="$GNOME_XML/lib" - if test \! -d $XMLBIN -o \! -d $XMLINC -o \! -d $XMLLIB; then - { { echo "$as_me:$LINENO: error: $GNOME_XML does not seem to be valid Gnome installation directory" >&5 + if test \! -d $XMLBIN -o \! -d $XMLINC -o \! -d $XMLLIB; then + { { echo "$as_me:$LINENO: error: $GNOME_XML does not seem to be valid Gnome installation directory" >&5 echo "$as_me: error: $GNOME_XML does not seem to be valid Gnome installation directory" >&2;} { (exit 1); exit 1; }; } - fi + fi cat >>confdefs.h <<\_ACEOF @@ -3861,25 +3842,25 @@ cat >>confdefs.h <<\_ACEOF _ACEOF - LIBXML2_SO_NAME=`cd $XMLLIB ; ls libxml2.?? libxml2.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - LIBGDOME_SO_NAME=`cd $XMLLIB ; ls libgdome.?? libgdome.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - LIBXSLT_SO_NAME=`cd $XMLLIB ; ls libxslt.?? libxslt.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - LIBEXSLT_SO_NAME=`cd $XMLLIB ; ls libexslt.?? libexslt.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - - if test -z "$GLIB_CONFIG"; then - GLIB_CONFIG=$XMLBIN/glib-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=glib-config - fi - fi - GLIB_CFLAGS=`$GLIB_CONFIG --cflags` - GLIB_LIBS=`$GLIB_CONFIG --libs` + LIBXML2_SO_NAME=`cd $XMLLIB ; ls libxml2.?? libxml2.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` + LIBGDOME_SO_NAME=`cd $XMLLIB ; ls libgdome.?? libgdome.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` + LIBXSLT_SO_NAME=`cd $XMLLIB ; ls libxslt.?? libxslt.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` + LIBEXSLT_SO_NAME=`cd $XMLLIB ; ls libexslt.?? libexslt.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` + + if test -z "$GLIB_CONFIG"; then + GLIB_CONFIG=$XMLBIN/glib-config + if test \! -x $GLIB_CONFIG; then + GLIB_CONFIG=glib-config + fi + fi + GLIB_CFLAGS=`$GLIB_CONFIG --cflags` + GLIB_LIBS=`$GLIB_CONFIG --libs` - XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC -I$XMLINC/libgdome -I$XMLINC/libxml2" - XML_LIBS="$GLIB_LIBS -L$XMLLIB -l$LIBXML2_SO_NAME -l$LIBGDOME_SO_NAME -l$LIBXSLT_SO_NAME -l$LIBEXSLT_SO_NAME" - if test \! -z "$LD_PATHLINK"; then + XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC -I$XMLINC/libgdome -I$XMLINC/libxml2" + XML_LIBS="$GLIB_LIBS -L$XMLLIB -l$LIBXML2_SO_NAME -l$LIBGDOME_SO_NAME -l$LIBXSLT_SO_NAME -l$LIBEXSLT_SO_NAME" + if test \! -z "$LD_PATHLINK"; then XML_LIBS="$XML_LIBS -Wl,$LD_PATHLINK -Wl,$XMLLIB" - fi + fi fi; @@ -3887,16 +3868,16 @@ fi; if test "${with_static_xml+set}" = set; then withval="$with_static_xml" - GNOME_XML=$withval - XMLBIN="$GNOME_XML/bin" - XMLINC="$GNOME_XML/include" - XMLLIB="$GNOME_XML/lib" + GNOME_XML=$withval + XMLBIN="$GNOME_XML/bin" + XMLINC="$GNOME_XML/include" + XMLLIB="$GNOME_XML/lib" - if test \! -d $XMLBIN -o \! -d $XMLINC -o \! -d $XMLLIB; then - { { echo "$as_me:$LINENO: error: $GNOME_XML does not seem to be valid Gnome installation directory" >&5 + if test \! -d $XMLBIN -o \! -d $XMLINC -o \! -d $XMLLIB; then + { { echo "$as_me:$LINENO: error: $GNOME_XML does not seem to be valid Gnome installation directory" >&5 echo "$as_me: error: $GNOME_XML does not seem to be valid Gnome installation directory" >&2;} { (exit 1); exit 1; }; } - fi + fi cat >>confdefs.h <<\_ACEOF @@ -3904,18 +3885,18 @@ cat >>confdefs.h <<\_ACEOF _ACEOF - if test -z "$GLIB_CONFIG"; then - GLIB_CONFIG=$XMLBIN/glib-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=glib-config - fi - fi - GLIB_CFLAGS=`$GLIB_CONFIG --cflags` + if test -z "$GLIB_CONFIG"; then + GLIB_CONFIG=$XMLBIN/glib-config + if test \! -x $GLIB_CONFIG; then + GLIB_CONFIG=glib-config + fi + fi + GLIB_CFLAGS=`$GLIB_CONFIG --cflags` - GLIB_DIR=`$GLIB_CONFIG --libs | sed 's/.*-L\([^ ]*\).*/\1/'` - GLIB_NAME=`$GLIB_CONFIG --libs | sed 's/.*-l\([^ ]*\).*/\1/'` - XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC -I$XMLINC/libgdome -I$XMLINC/libxml2" - XML_LIBS="$XMLLIB/libgdome.a $XMLLIB/libxslt.a $XMLLIB/libexslt.a $XMLLIB/libxml2.a $GLIB_DIR/lib$GLIB_NAME.a" + GLIB_DIR=`$GLIB_CONFIG --libs | sed 's/.*-L\([^ ]*\).*/\1/'` + GLIB_NAME=`$GLIB_CONFIG --libs | sed 's/.*-l\([^ ]*\).*/\1/'` + XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC -I$XMLINC/libgdome -I$XMLINC/libxml2" + XML_LIBS="$XMLLIB/libgdome.a $XMLLIB/libxslt.a $XMLLIB/libexslt.a $XMLLIB/libxml2.a $GLIB_DIR/lib$GLIB_NAME.a" fi; @@ -3926,16 +3907,16 @@ fi; if test "${with_shared_mailreceive+set}" = set; then withval="$with_shared_mailreceive" - GNOME_MIME=$withval - MIMEBIN="$GNOME_MIME/bin" - MIMEINC="$GNOME_MIME/include" - MIMELIB="$GNOME_MIME/lib" + GNOME_MIME=$withval + MIMEBIN="$GNOME_MIME/bin" + MIMEINC="$GNOME_MIME/include" + MIMELIB="$GNOME_MIME/lib" - if test \! -d $MIMEBIN -o \! -d $MIMEINC -o \! -d $MIMELIB; then - { { echo "$as_me:$LINENO: error: $GNOME_MIME does not seem to be valid Gnome installation directory" >&5 + if test \! -d $MIMEBIN -o \! -d $MIMEINC -o \! -d $MIMELIB; then + { { echo "$as_me:$LINENO: error: $GNOME_MIME does not seem to be valid Gnome installation directory" >&5 echo "$as_me: error: $GNOME_MIME does not seem to be valid Gnome installation directory" >&2;} { (exit 1); exit 1; }; } - fi + fi cat >>confdefs.h <<\_ACEOF @@ -3943,22 +3924,22 @@ cat >>confdefs.h <<\_ACEOF _ACEOF - LIBMIME_SO_NAME=`cd $MIMELIB ; ls libgmime.?? libgmime.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` + LIBMIME_SO_NAME=`cd $MIMELIB ; ls libgmime.?? libgmime.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - if test -z "$GLIB_CONFIG"; then - GLIB_CONFIG=$MIMEBIN/glib-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=glib-config - fi - fi - GLIB_CFLAGS=`$GLIB_CONFIG --cflags` - GLIB_LIBS=`$GLIB_CONFIG --libs` + if test -z "$GLIB_CONFIG"; then + GLIB_CONFIG=$MIMEBIN/glib-config + if test \! -x $GLIB_CONFIG; then + GLIB_CONFIG=glib-config + fi + fi + GLIB_CFLAGS=`$GLIB_CONFIG --cflags` + GLIB_LIBS=`$GLIB_CONFIG --libs` - MIME_INCLUDES="$GLIB_CFLAGS -I$MIMEINC/gmime" - MIME_LIBS="$GLIB_LIBS -L$MIMELIB -l$LIBMIME_SO_NAME" - if test \! -z "$LD_PATHLINK"; then + MIME_INCLUDES="$GLIB_CFLAGS -I$MIMEINC/gmime" + MIME_LIBS="$GLIB_LIBS -L$MIMELIB -l$LIBMIME_SO_NAME" + if test \! -z "$LD_PATHLINK"; then MIME_LIBS="$MIME_LIBS -Wl,$LD_PATHLINK -Wl,$MIMELIB" - fi + fi fi; @@ -3966,16 +3947,16 @@ fi; if test "${with_static_mailreceive+set}" = set; then withval="$with_static_mailreceive" - GNOME_MIME=$withval - MIMEBIN="$GNOME_MIME/bin" - MIMEINC="$GNOME_MIME/include" - MIMELIB="$GNOME_MIME/lib" + GNOME_MIME=$withval + MIMEBIN="$GNOME_MIME/bin" + MIMEINC="$GNOME_MIME/include" + MIMELIB="$GNOME_MIME/lib" - if test \! -d $MIMEBIN -o \! -d $MIMEINC -o \! -d $MIMELIB; then - { { echo "$as_me:$LINENO: error: $GNOME_MIME does not seem to be valid Gnome installation directory" >&5 + if test \! -d $MIMEBIN -o \! -d $MIMEINC -o \! -d $MIMELIB; then + { { echo "$as_me:$LINENO: error: $GNOME_MIME does not seem to be valid Gnome installation directory" >&5 echo "$as_me: error: $GNOME_MIME does not seem to be valid Gnome installation directory" >&2;} { (exit 1); exit 1; }; } - fi + fi cat >>confdefs.h <<\_ACEOF @@ -3983,18 +3964,18 @@ cat >>confdefs.h <<\_ACEOF _ACEOF - if test -z "$GLIB_CONFIG"; then - GLIB_CONFIG=$MIMEBIN/glib-config - if test \! -x $GLIB_CONFIG; then - GLIB_CONFIG=glib-config - fi - fi - GLIB_CFLAGS=`$GLIB_CONFIG --cflags` + if test -z "$GLIB_CONFIG"; then + GLIB_CONFIG=$MIMEBIN/glib-config + if test \! -x $GLIB_CONFIG; then + GLIB_CONFIG=glib-config + fi + fi + GLIB_CFLAGS=`$GLIB_CONFIG --cflags` - GLIB_DIR=`$GLIB_CONFIG --libs | sed 's/.*-L\([^ ]*\).*/\1/'` - GLIB_NAME=`$GLIB_CONFIG --libs | sed 's/.*-l\([^ ]*\).*/\1/'` - MIME_INCLUDES="$GLIB_CFLAGS -I$MIMEINC/gmime" - MIME_LIBS="$MIMELIB/libgmime.a $GLIB_DIR/lib$GLIB_NAME.a" + GLIB_DIR=`$GLIB_CONFIG --libs | sed 's/.*-L\([^ ]*\).*/\1/'` + GLIB_NAME=`$GLIB_CONFIG --libs | sed 's/.*-l\([^ ]*\).*/\1/'` + MIME_INCLUDES="$GLIB_CFLAGS -I$MIMEINC/gmime" + MIME_LIBS="$MIMELIB/libgmime.a $GLIB_DIR/lib$GLIB_NAME.a" fi; @@ -4019,11 +4000,11 @@ fi; if test "${with_apache13+set}" = set; then withval="$with_apache13" APACHE13=$withval - if test \! -f "$APACHE13/src/include/httpd.h"; then - { { echo "$as_me:$LINENO: error: $APACHE13 does not seem to be valid Apache13 source distribution directory" >&5 + if test \! -f "$APACHE13/src/include/httpd.h"; then + { { echo "$as_me:$LINENO: error: $APACHE13 does not seem to be valid Apache13 source distribution directory" >&5 echo "$as_me: error: $APACHE13 does not seem to be valid Apache13 source distribution directory" >&2;} { (exit 1); exit 1; }; } - fi + fi fi; @@ -6491,11 +6472,6 @@ rm -f conftest.$ac_objext conftest.$ac_e -APACHE_LIBS="$LIBS $LIBADD_DL" - - - - # expand apostrophed e_prefix=$prefix test "x$e_prefix" = xNONE && e_prefix=$ac_default_prefix @@ -6511,12 +6487,12 @@ charsetsdir=$e_sysconfdir/parser3.charse e_libdir=$libdir if test "$e_libdir" = "\${exec_prefix}/lib"; then - # Let make expand exec_prefix. - e_exec_prefix=$exec_prefix - test "x$e_exec_prefix" = xNONE && e_exec_prefix=$e_prefix + # Let make expand exec_prefix. + e_exec_prefix=$exec_prefix + test "x$e_exec_prefix" = xNONE && e_exec_prefix=$e_prefix - # expand apostrophed - test "$e_libdir" = "\${exec_prefix}/lib" && e_libdir="${e_exec_prefix}/lib" + # expand apostrophed + test "$e_libdir" = "\${exec_prefix}/lib" && e_libdir="${e_exec_prefix}/lib" fi sqldriversdir=$e_libdir @@ -6668,13 +6644,6 @@ echo "$as_me: error: conditional \"am__f Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${DO_NOT_LINK_LIBSTDCPP_TRUE}" && test -z "${DO_NOT_LINK_LIBSTDCPP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"DO_NOT_LINK_LIBSTDCPP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"DO_NOT_LINK_LIBSTDCPP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${COMPILE_APACHE13_MODULE_TRUE}" && test -z "${COMPILE_APACHE13_MODULE_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"COMPILE_APACHE13_MODULE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -7296,8 +7265,7 @@ s,@dll_extension@,$dll_extension,;t t s,@mysql_client@,$mysql_client,;t t s,@pgsql_client@,$pgsql_client,;t t s,@oracle_client@,$oracle_client,;t t -s,@DO_NOT_LINK_LIBSTDCPP_TRUE@,$DO_NOT_LINK_LIBSTDCPP_TRUE,;t t -s,@DO_NOT_LINK_LIBSTDCPP_FALSE@,$DO_NOT_LINK_LIBSTDCPP_FALSE,;t t +s,@CPP_LIBS@,$CPP_LIBS,;t t s,@XML_INCLUDES@,$XML_INCLUDES,;t t s,@XML_LIBS@,$XML_LIBS,;t t s,@MIME_INCLUDES@,$MIME_INCLUDES,;t t @@ -7311,7 +7279,6 @@ s,@subdirs@,$subdirs,;t t s,@LIBADD_DL@,$LIBADD_DL,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t -s,@APACHE_LIBS@,$APACHE_LIBS,;t t s,@charsetsdir@,$charsetsdir,;t t s,@sqldriversdir@,$sqldriversdir,;t t s,@LIBOBJS@,$LIBOBJS,;t t