--- parser3/configure 2002/02/18 08:39:14 1.8 +++ parser3/configure 2002/02/28 14:59:12 1.12 @@ -14,21 +14,21 @@ ac_default_prefix=/usr/local ac_help="$ac_help --disable-string-origins to switch off string origin tracking" ac_help="$ac_help - --with-apache13=D D is the Apache13 source distribution directory - builds library for apache_module using that dir - (do not add /src)" -ac_help="$ac_help --with-pathlink=LKEY put dynamic libraries paths to binary using linker key (-R, -rpath-link)" ac_help="$ac_help --with-glib-config=FILE FILE is glib library configuration file (search for glib*-config)" ac_help="$ac_help - --with-gnome-xml=D D is the directory where - Gnome XML libraries are installed" + --with-shared-xml=D D is the directory where + Gnome XML libraries are installed (shared libs)" +ac_help="$ac_help + --with-static-xml=D D is the directory where + Gnome XML libraries are installed (static libs)" ac_help="$ac_help - --with-db2[=D] D is the DB2 installation directory - DO NOT FORGET TO COMPILE DB2 WITH EXCEPTIONS SUPPORT!" + --with-apache13=D D is the Apache13 source distribution directory + builds library for apache_module using that dir + (do not add /src)" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -785,7 +785,7 @@ fi -P3S=`cd $srcdir ; pwd` +P3S=`cd $srcdir/src ; pwd` PARSER_VERSION=$VERSION @@ -1300,28 +1300,6 @@ fi fi -# Check whether --with-apache13 or --without-apache13 was given. -if test "${with_apache13+set}" = set; then - withval="$with_apache13" - APACHE13=$withval - if test \! -f "$APACHE13/src/include/httpd.h"; then - { echo "configure: error: $APACHE13 does not seem to be valid Apache13 source distribution directory" 1>&2; exit 1; } - fi - -fi - - - - -if test -n "$APACHE13"; then - COMPILE_APACHE13_MODULE_TRUE= - COMPILE_APACHE13_MODULE_FALSE='#' -else - COMPILE_APACHE13_MODULE_TRUE='#' - COMPILE_APACHE13_MODULE_FALSE= -fi - - # Check whether --with-pathlink or --without-pathlink was given. if test "${with_pathlink+set}" = set; then withval="$with_pathlink" @@ -1338,16 +1316,16 @@ if test "${with_glib_config+set}" = set; fi -# Check whether --with-gnome-xml or --without-gnome-xml was given. -if test "${with_gnome_xml+set}" = set; then - withval="$with_gnome_xml" +# Check whether --with-shared-xml or --without-shared-xml was given. +if test "${with_shared_xml+set}" = set; then + withval="$with_shared_xml" GNOME_XML=$withval - XMLBIN_DIR="$GNOME_XML/bin" - XMLINC_DIR="$GNOME_XML/include" - XMLLIB_DIR="$GNOME_XML/lib" + XMLBIN="$GNOME_XML/bin" + XMLINC="$GNOME_XML/include" + XMLLIB="$GNOME_XML/lib" - if test \! -d $XMLBIN_DIR -o \! -d $XMLINC_DIR -o \! -d $XMLLIB_DIR; then + if test \! -d $XMLBIN -o \! -d $XMLINC -o \! -d $XMLLIB; then { echo "configure: error: $GNOME_XML does not seem to be valid Gnome installation directory" 1>&2; exit 1; } fi @@ -1356,25 +1334,13 @@ if test "${with_gnome_xml+set}" = set; t EOF - LIBXML2_SO_NAME=`cd $XMLLIB_DIR ; ls libxml2.?? libxml2.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - if test -z "$LIBXML2_SO_NAME"; then - { echo "configure: error: $LIBXML_DIR does not containt XML2 dynamic library" 1>&2; exit 1; } - fi - LIBGDOME_SO_NAME=`cd $XMLLIB_DIR ; ls libgdome.?? libgdome.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - if test -z "$LIBGDOME_SO_NAME"; then - { echo "configure: error: $LIBXML_DIR does not containt GDOME dynamic library" 1>&2; exit 1; } - fi - LIBXSLT_SO_NAME=`cd $XMLLIB_DIR ; ls libxslt.?? libxslt.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - if test -z "$LIBXSLT_SO_NAME"; then - { echo "configure: error: $LIBXML_DIR does not containt XSLT dynamic library" 1>&2; exit 1; } - fi - LIBEXSLT_SO_NAME=`cd $XMLLIB_DIR ; ls libexslt.?? libexslt.??? 2>/dev/null | grep -v \.la$ | sed 's/lib//' | sed 's/\..*//'` - if test -z "$LIBEXSLT_SO_NAME"; then - { echo "configure: error: $LIBXML_DIR does not containt EXSLT dynamic library" 1>&2; exit 1; } - fi + 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_DIR/glib-config + GLIB_CONFIG=$XMLBIN/glib-config if test \! -x $GLIB_CONFIG; then GLIB_CONFIG=glib-config fi @@ -1382,72 +1348,73 @@ EOF GLIB_CFLAGS=`$GLIB_CONFIG --cflags` GLIB_LIBS=`$GLIB_CONFIG --libs` - XML_INCLUDES="$GLIB_CFLAGS -I$XMLINC_DIR -I$XMLINC_DIR/libgdome -I$XMLINC_DIR/libxml2" - XML_LIBS="$GLIB_LIBS -L$XMLLIB_DIR -l$LIBXML2_SO_NAME -l$LIBGDOME_SO_NAME -l$LIBXSLT_SO_NAME -l$LIBEXSLT_SO_NAME" + 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_DIR" + XML_LIBS="$XML_LIBS -Wl,$LD_PATHLINK -Wl,$XMLLIB" fi fi +# Check whether --with-static-xml or --without-static-xml was given. +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" - -# Check whether --with-db2 or --without-db2 was given. -if test "${with_db2+set}" = set; then - withval="$with_db2" - DB2_INST=$withval - if test \! -f "$DB2_INST/include/db.h"; then - { echo "configure: error: $DB2_INST does not seem to be valid DB2 installation directory" 1>&2; exit 1; } - fi - if test \! -f "$DB2_INST/lib/libdb.a"; then - { echo "configure: error: $DB2_INST does not seem to be valid DB2 installation directory" 1>&2; exit 1; } + if test \! -d $XMLBIN -o \! -d $XMLINC -o \! -d $XMLLIB; then + { echo "configure: error: $GNOME_XML does not seem to be valid Gnome installation directory" 1>&2; exit 1; } fi - echo $ac_n "checking version of LIBDB""... $ac_c" 1>&6 -echo "configure:1409: checking version of LIBDB" >&5 - cat > conftest.$ac_ext < - -int main() { -#ifdef DB_VERSION_MAJOR - # if DB_VERSION_MAJOR!=2 - # error Parser needs LIBDB of 2.x.x version to compile - # endif - #else - # error DB_VERSION_MAJOR not defined - #endif - -; return 0; } -EOF -if { (eval echo configure:1426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - echo "$ac_t""ok" 1>&6 - DB2=1 - cat >> confdefs.h <<\EOF -#define DB2 + cat >> confdefs.h <<\EOF +#define XML EOF - DB2_INCLUDES="-I$DB2_INST/include" - DB2_LIBS="-L$DB2_INST/lib -ldb" - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - { echo "configure: error: bad" 1>&2; exit 1; } - + + 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" + fi -rm -f conftest* + + + + +# Check whether --with-apache13 or --without-apache13 was given. +if test "${with_apache13+set}" = set; then + withval="$with_apache13" + APACHE13=$withval + if test \! -f "$APACHE13/src/include/httpd.h"; then + { echo "configure: error: $APACHE13 does not seem to be valid Apache13 source distribution directory" 1>&2; exit 1; } + fi fi +if test -n "$APACHE13"; then + COMPILE_APACHE13_MODULE_TRUE= + COMPILE_APACHE13_MODULE_FALSE='#' +else + COMPILE_APACHE13_MODULE_TRUE='#' + COMPILE_APACHE13_MODULE_FALSE= +fi + + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : @@ -1455,7 +1422,7 @@ else { echo "configure: error: can not r fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1459: checking host system type" >&5 +echo "configure:1426: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1489,7 +1456,7 @@ echo "$ac_t""$host" 1>&6 # 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:1493: checking for a BSD compatible install" >&5 +echo "configure:1460: 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 @@ -1542,7 +1509,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1546: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1513: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1571,7 +1538,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:1575: checking for $ac_word" >&5 +echo "configure:1542: 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 @@ -1603,7 +1570,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:1607: checking for $ac_word" >&5 +echo "configure:1574: 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 @@ -1638,7 +1605,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:1642: checking for $ac_word" >&5 +echo "configure:1609: 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 @@ -1672,7 +1639,7 @@ if test "$YACC" != "bison -y"; then echo "configure: warning: to regenerate Parser grammar YOU WOULD NEED BISON" 1>&2 else echo $ac_n "checking bison version""... $ac_c" 1>&6 -echo "configure:1676: checking bison version" >&5 +echo "configure:1643: checking bison version" >&5 oldIFS=$IFS; IFS=. set `bison -V | sed -e 's/^GNU Bison version //'` IFS=$oldIFS @@ -1692,7 +1659,7 @@ subdirs="src/libltdl" LIBADD_DL= echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1696: checking for dlopen in -ldl" >&5 +echo "configure:1663: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1700,7 +1667,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1685: \"$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 @@ -1736,12 +1703,12 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:1740: checking for dlopen" >&5 +echo "configure:1707: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -1792,12 +1759,12 @@ fi fi echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:1796: checking for shl_load" >&5 +echo "configure:1763: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -1844,7 +1811,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:1848: checking for shl_load in -ldld" >&5 +echo "configure:1815: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1852,7 +1819,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1837: \"$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 @@ -1892,7 +1859,7 @@ fi fi echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:1896: checking for dld_link in -ldld" >&5 +echo "configure:1863: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1900,7 +1867,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1885: \"$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 @@ -1945,12 +1912,12 @@ if test "x$ac_cv_func_dlopen" = xyes || for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1949: checking for $ac_func" >&5 +echo "configure:1916: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1947: \"$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 @@ -2005,7 +1972,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2009: checking how to run the C++ preprocessor" >&5 +echo "configure:1976: 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 @@ -2018,12 +1985,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1994: \"$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 : @@ -2048,12 +2015,12 @@ CXXCPP="$ac_cv_prog_CXXCPP" echo "$ac_t""$CXXCPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2052: checking for ANSI C header files" >&5 +echo "configure:2019: 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 @@ -2061,7 +2028,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2032: \"$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* @@ -2078,7 +2045,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 @@ -2096,7 +2063,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 @@ -2117,7 +2084,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:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2155,12 +2122,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2159: checking for size_t" >&5 +echo "configure:2126: 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 @@ -2190,12 +2157,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2194: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2161: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2204,7 +2171,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2252,17 +2219,17 @@ sys/resource.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2256: checking for $ac_hdr" >&5 +echo "configure:2223: 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:2266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2233: \"$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* @@ -2293,7 +2260,7 @@ done case "$host" in *-sunos5.6* | *-solaris2.6*) echo $ac_n "checking for main in -lxnet""... $ac_c" 1>&6 -echo "configure:2297: checking for main in -lxnet" >&5 +echo "configure:2264: checking for main in -lxnet" >&5 ac_lib_var=`echo xnet'_'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 @@ -2301,14 +2268,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lxnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2279: \"$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 @@ -2338,7 +2305,7 @@ fi ;; *-sunos5* | *-solaris2*) echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:2342: checking for main in -lsocket" >&5 +echo "configure:2309: 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 @@ -2346,14 +2313,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2324: \"$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 @@ -2381,7 +2348,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:2385: checking for main in -lnsl" >&5 +echo "configure:2352: 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 @@ -2389,14 +2356,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2367: \"$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 @@ -2426,7 +2393,7 @@ fi ;; *-nec-sysv4*) echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2430: checking for gethostbyname in -lnsl" >&5 +echo "configure:2397: 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 @@ -2434,7 +2401,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2419: \"$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 @@ -2476,7 +2443,7 @@ else fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2480: checking for socket in -lsocket" >&5 +echo "configure:2447: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2484,7 +2451,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2469: \"$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 @@ -2532,7 +2499,7 @@ fi EOF echo $ac_n "checking for socket in -lwsock32""... $ac_c" 1>&6 -echo "configure:2536: checking for socket in -lwsock32" >&5 +echo "configure:2503: checking for socket in -lwsock32" >&5 ac_lib_var=`echo wsock32'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2540,7 +2507,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lwsock32 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2525: \"$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 @@ -2585,7 +2552,7 @@ fi esac echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:2589: checking for sin in -lm" >&5 +echo "configure:2556: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2593,7 +2560,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2578: \"$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 @@ -2647,12 +2614,12 @@ getrusage do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2651: checking for $ac_func" >&5 +echo "configure:2618: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2649: \"$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 @@ -2707,12 +2674,12 @@ done for ac_func in qsort do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2711: checking for $ac_func" >&5 +echo "configure:2678: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2709: \"$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 @@ -2766,12 +2733,12 @@ done for ac_func in select do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2770: checking for $ac_func" >&5 +echo "configure:2737: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2768: \"$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 @@ -2824,9 +2791,9 @@ done echo $ac_n "checking whether compiler supports pragma pack""... $ac_c" 1>&6 -echo "configure:2828: checking whether compiler supports pragma pack" >&5 +echo "configure:2795: checking whether compiler supports pragma pack" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -2859,9 +2826,9 @@ fi rm -f conftest* echo $ac_n "checking for set_new_handler""... $ac_c" 1>&6 -echo "configure:2863: checking for set_new_handler" >&5 +echo "configure:2830: checking for set_new_handler" >&5 cat > conftest.$ac_ext < @@ -2873,7 +2840,7 @@ std::set_new_handler(failed_new); ; return 0; } EOF -if { (eval echo configure:2877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -2919,7 +2886,7 @@ if test "$e_libdir" = "\${exec_prefix}/l # Let make expand exec_prefix. e_exec_prefix=$exec_prefix - test "x$e_exec_prefix" = xNONE && e_exec_prefix=$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" @@ -3080,13 +3047,11 @@ s%@SET_MAKE@%$SET_MAKE%g s%@P3S@%$P3S%g s%@CC@%$CC%g s%@CXX@%$CXX%g +s%@XML_INCLUDES@%$XML_INCLUDES%g +s%@XML_LIBS@%$XML_LIBS%g s%@APACHE13@%$APACHE13%g s%@COMPILE_APACHE13_MODULE_TRUE@%$COMPILE_APACHE13_MODULE_TRUE%g s%@COMPILE_APACHE13_MODULE_FALSE@%$COMPILE_APACHE13_MODULE_FALSE%g -s%@XML_INCLUDES@%$XML_INCLUDES%g -s%@XML_LIBS@%$XML_LIBS%g -s%@DB2_INCLUDES@%$DB2_INCLUDES%g -s%@DB2_LIBS@%$DB2_LIBS%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -3422,6 +3387,3 @@ if test "$no_recursion" != yes; then done fi - - -