--- parser3/Attic/configure.in 2002/10/14 08:29:29 1.47 +++ parser3/Attic/configure.in 2003/01/09 16:48:16 1.58 @@ -18,6 +18,7 @@ else rm -f $srcdir/src/include/pa_version.h.new fi + dnl AC_CANONICAL_SYSTEM AC_CANONICAL_HOST AC_SUBST(host_os) @@ -50,25 +51,17 @@ 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], +AC_ARG_ENABLE(safe-mode, [ --disable-safe-mode to enable reading and executing + files belonging to group+user other then effective], [ -LINK_LIBSTDCPP_FLAG=$enableval -if test "$enableval" = "no"; then - AC_MSG_WARN(disabling libstdc++ linkage) -fi + SAFE_MODE=$enableval ] ) -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 - AC_MSG_WARN(disabling string origin tracking) - AC_DEFINE(NO_STRING_ORIGIN,,no string origin tracking) +if test "$SAFE_MODE" = "no"; then + AC_MSG_WARN(enabling reading of files belonging to group+user other then effective) +else + AC_DEFINE(PA_SAFE_MODE,,disabled reading of files belonging to group+user other then effective) fi -] -) AC_ARG_ENABLE(execs, [ --disable-execs to disable any execs (file::exec, file::cgi, unix mail:send)], @@ -80,15 +73,16 @@ fi ] ) -AC_ARG_ENABLE(foreign-group-files, [ --disable-foreign-group-files to disable read and executing - files belonging to group other then effective], +AC_ARG_ENABLE(string-origins, [ --disable-string-origins to switch off string origin tracking], [ if test "$enableval" = "no"; then - AC_MSG_WARN(disabling reading of files belonging to group other then effective) - AC_DEFINE(NO_FOREIGN_GROUP_FILES,,disabled reading and executing files of non-process-effective-group) + AC_MSG_WARN(disabling string origin tracking) + AC_DEFINE(NO_STRING_ORIGIN,,no string origin tracking) fi ] ) + + srccharsetsdir=$srcdir/etc/parser3.charsets CHARSETS_REQUESTED="windows-1251" AC_ARG_WITH(charsets, [ --with-charsets=CHARSET[,CHARSET,...] Enables charsets in root config (windows-1251, @@ -107,7 +101,7 @@ AC_DEFUN(PA_SUBSTCHARSET, [ commentcharset_$2='#' for c in $CHARSETS_REQUESTED; do if test "$1" = "$c"; then - AC_MSG_WARN(Enabling charset $1) + AC_MSG_WARN(enabling charset $1) commentcharset_$2= fi done @@ -202,6 +196,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 +376,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 moved from src/lib/libltdl/configure.in +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)])]) @@ -398,6 +413,7 @@ dnl Checks for header files. AC_HEADER_TIME AC_CHECK_HEADERS( +signal.h \ unistd.h \ process.h \ stddef.h \ @@ -422,7 +438,11 @@ sys/locking.h \ sys/types.h \ sys/select.h \ sys/resource.h \ -winsock.h +winsock.h \ +sys/socket.h \ +netinet/in.h \ +arpa/inet.h \ +netdb.h ) dnl Checks for libraries. @@ -464,9 +484,11 @@ flock \ _locking \ fcntl \ lockf \ +ftruncate \ getrusage \ gettimeofday \ -crypt +crypt \ +sigsetjmp siglongjmp ) dnl We require qsort(3) and select(2). @@ -602,7 +624,35 @@ sqldriversdir=$e_libdir AC_SUBST(sqldriversdir) -dnl Output makefiles +dnl Output header and makefiles + +AH_TEMPLATE([HAVE_DLD],[Define if you have the GNU dld library]) + +AH_TEMPLATE([HAVE_LIBDL], + [Define if you have the libdl library or equivalent.]) + +AH_TEMPLATE([HAVE_SHL_LOAD], + [Define if you have the shl_load function. ]) + + +AH_TEMPLATE([size_t], + [Define to `unsigned int' if does not define.]) + +AH_TEMPLATE([ssize_t], + [Define to `int' if does not define.]) + +AH_TEMPLATE([HAVE_DAYLIGHT], + [Define if you have daylight external variable in ]) + +AH_TEMPLATE([HAVE_TIMEZONE], + [Define if you have timezone external variable in ]) + +AH_TEMPLATE([HAVE_TM_GMTOFF], + [Define if you have tm_gmtoff member of tm structure in ]) + +AH_TEMPLATE([HAVE_TM_TZADJ], + [Define if you have tm_tzadj member of tm structure in ]) + 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/libltdl/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)