--- parser3/Attic/configure.in 2002/11/28 08:59:39 1.50 +++ parser3/Attic/configure.in 2002/12/20 14:38:06 1.55 @@ -50,17 +50,6 @@ AC_LANG_CPLUSPLUS dnl Arguments -AC_ARG_ENABLE(link-libstdcpp, [ --disable-link-libstdcpp to disable libstdc++ linkage, - if you belive you do not need one], -[ -LINK_LIBSTDCPP_FLAG=$enableval -if test "$enableval" = "no"; then - AC_MSG_WARN(disabling libstdc++ linkage) -fi -] -) -AM_CONDITIONAL(DO_NOT_LINK_LIBSTDCPP, test "$LINK_LIBSTDCPP_FLAG" = "no") - AC_ARG_ENABLE(string-origins, [ --disable-string-origins to switch off string origin tracking], [ if test "$enableval" = "no"; then @@ -202,6 +191,27 @@ AC_ARG_WITH(pathlink,[ --with-pathlink= using linker key (-R, -rpath-link)], LD_PATHLINK=$withval ) +AC_ARG_WITH(link-stdcpp, [ --with-link-stdcpp=PATH to directory with libstdc++ + --without-link-stdcpp to disable libstdc++ linkage, + if you belive you do not need one], +[ +LIBSTDCPP_PATH=$withval +if test "$LIBSTDCPP_PATH" = "no"; then + AC_MSG_WARN(disabling libstdc++ linkage) +else + if test -z "$LD_PATHLINK"; then + AC_MSG_ERROR(when using --with-link-stdcpp one must specify --with-pathlink) + fi + LIBS="$LIBS -Wl,$LD_PATHLINK -Wl,$LIBSTDCPP_PATH" +fi +], +#pseudo path, meaning still link libstdcpp. value needed to trick next _CONDITIONAL +LIBSTDCPP_PATH=" " +) +AM_CONDITIONAL(DO_NOT_LINK_LIBSTDCPP, test "$LIBSTDCPP_PATH" = "no") + + + AC_ARG_WITH(sjlj-exceptions,[ --with-sjlj-exceptions enable simple 'throw' from dynamic library], AC_DEFINE(PA_WITH_SJLJ_EXCEPTIONS,,one can throw from dynamic library) ) @@ -361,14 +371,14 @@ AM_CONDITIONAL(COMPILE_APACHE13_MODULE, dnl Enable building of the convenience library dnl and set LIBLTDL accordingly -AC_LIBLTDL_CONVENIENCE(src/lib/libltdl) +AC_LIBLTDL_CONVENIENCE(src/lib/ltdl) dnl Substitute INCLTDL and LIBLTDL in the Makefiles AC_SUBST(INCLTDL) AC_SUBST(LIBLTDL) dnl Configure libltdl -AC_CONFIG_SUBDIRS(src/lib/libltdl) -dnl copied from src/lib/libltdl/configure.in [can not move, they need this info to detect other vitals, ex. NEED_USCORE] +AC_CONFIG_SUBDIRS(src/lib/ltdl) +dnl copied from lib/libltdl/configure.in [can not move, they need this info to detect other vitals, ex. NEED_USCORE] LIBADD_DL= AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1) LIBADD_DL="-ldl"], [AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL, 1)])]) @@ -469,6 +479,7 @@ flock \ _locking \ fcntl \ lockf \ +ftruncate \ getrusage \ gettimeofday \ crypt \ @@ -611,4 +622,4 @@ AC_SUBST(sqldriversdir) dnl Output makefiles AM_CONFIG_HEADER(src/include/pa_config_auto.h) -AC_OUTPUT(Makefile src/Makefile src/types/Makefile src/classes/Makefile src/classes/gd/Makefile src/classes/smtp/Makefile src/include/Makefile src/main/Makefile src/sql/Makefile src/lib/Makefile src/lib/pcre/Makefile src/lib/md5/Makefile src/lib/patches/Makefile src/targets/Makefile src/targets/cgi/Makefile src/targets/apache13/Makefile src/targets/apache13/hook/Makefile src/targets/apache13/p3runConfigure src/targets/isapi/Makefile etc/Makefile etc/parser3.charsets/Makefile bin/Makefile bin/auto.p.dist) +AC_OUTPUT(Makefile src/Makefile src/types/Makefile src/classes/Makefile src/classes/gd/Makefile src/classes/smtp/Makefile src/include/Makefile src/main/Makefile src/sql/Makefile src/lib/Makefile src/lib/ltdl/Makefile src/lib/pcre/Makefile src/lib/md5/Makefile src/lib/patches/Makefile src/targets/Makefile src/targets/cgi/Makefile src/targets/apache13/Makefile src/targets/apache13/hook/Makefile src/targets/apache13/p3runConfigure src/targets/isapi/Makefile etc/Makefile etc/parser3.charsets/Makefile bin/Makefile bin/auto.p.dist)