|
|
| version 1.24, 2002/06/10 11:35:52 | version 1.31, 2002/06/21 12:42:18 |
|---|---|
| Line 284 fi | Line 284 fi |
| dnl Enable building of the convenience library | dnl Enable building of the convenience library |
| dnl and set LIBLTDL accordingly | dnl and set LIBLTDL accordingly |
| AC_LIBLTDL_CONVENIENCE(src/libltdl) | AC_LIBLTDL_CONVENIENCE(src/lib/libltdl) |
| dnl Substitute INCLTDL and LIBLTDL in the Makefiles | dnl Substitute INCLTDL and LIBLTDL in the Makefiles |
| AC_SUBST(INCLTDL) | AC_SUBST(INCLTDL) |
| AC_SUBST(LIBLTDL) | AC_SUBST(LIBLTDL) |
| dnl Configure libltdl | dnl Configure libltdl |
| AC_CONFIG_SUBDIRS(src/libltdl) | AC_CONFIG_SUBDIRS(src/lib/libltdl) |
| dnl moved from src/libltdl/configure.in | dnl moved from src/lib/libltdl/configure.in |
| LIBADD_DL= | LIBADD_DL= |
| AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1) LIBADD_DL="-ldl"], | AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1) LIBADD_DL="-ldl"], |
| [AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL, 1)])]) | [AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL, 1)])]) |
| Line 362 case "$host" in | Line 362 case "$host" in |
| AC_CHECK_LIB(wsock32, socket) | AC_CHECK_LIB(wsock32, socket) |
| ;; | ;; |
| # never tested this, only theoretically by letter from demos about parser2 build | # never tested this, only theoretically by letter from demos about parser2 build |
| *-hp-ux*) | *-hpux*) |
| AC_CHECK_LIB(nsl, main) | AC_CHECK_LIB(nsl, main) |
| ;; | ;; |
| esac | esac |
| Line 389 AC_CHECK_FUNCS(select, , AC_MSG_ERROR([N | Line 389 AC_CHECK_FUNCS(select, , AC_MSG_ERROR([N |
| AC_MSG_CHECKING(whether compiler supports pragma pack) | AC_MSG_CHECKING(whether compiler supports pragma pack) |
| AC_TRY_COMPILE( | AC_TRY_COMPILE( |
| , | |
| #pragma pack(1) | #pragma pack(1) |
| struct must_be_1_byte { | struct _1_byte { |
| char c; | char c; |
| int i; | }; |
| } s; | |
| #pragma pack() | #pragma pack() |
| if(sizeof(must_be_1_byte)!=1) | ,,[ |
| return 1; | |
| /* must not hang here: seen on sparc arch -- compiler generated even address-accessing instructions here */ | |
| s.i=123; /* asm:st /* | |
| if(s.i!=123) /* asm:lduh */ | |
| return 1; | |
| ,[ | |
| AC_MSG_RESULT(yes) | AC_MSG_RESULT(yes) |
| AC_DEFINE(HAVE_PRAGMA_PACK,,compiler supports pragma pack) | AC_DEFINE(HAVE_PRAGMA_PACK,,compiler supports pragma pack) |
| ], | ], |
| Line 460 test "x$e_prefix" = xNONE && e_prefix=$a | Line 452 test "x$e_prefix" = xNONE && e_prefix=$a |
| e_sysconfdir=$sysconfdir | e_sysconfdir=$sysconfdir |
| test "$e_sysconfdir" = "\${prefix}/etc" && e_sysconfdir="${e_prefix}/etc" | test "$e_sysconfdir" = "\${prefix}/etc" && e_sysconfdir="${e_prefix}/etc" |
| dnl this is used in targets/cgi/parser3.C to load root config | |
| rootconfigdir=$e_sysconfdir | |
| AC_SUBST(rootconfigdir) | |
| dnl these are used to fill in etc/parser3.conf | dnl these are used to fill in etc/parser3.conf |
| charsetsdir=$e_sysconfdir/parser3.charsets | charsetsdir=$e_sysconfdir/parser3.charsets |
| Line 489 AC_SUBST(sqldriversdir) | Line 476 AC_SUBST(sqldriversdir) |
| dnl Output makefiles | dnl Output makefiles |
| AM_CONFIG_HEADER(src/include/pa_config_auto.h) | AM_CONFIG_HEADER(src/include/pa_config_auto.h) |
| AC_OUTPUT(Makefile src/Makefile src/libltdl/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/patches/Makefile src/pcre/Makefile src/targets/Makefile src/targets/cgi/pa_config_paths.h src/targets/cgi/Makefile src/targets/apache13/Makefile src/targets/apache13/p3runConfigure src/targets/isapi/Makefile etc/parser3.charsets/Makefile etc/parser3.conf etc/Makefile) | 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/patches/Makefile src/targets/Makefile src/targets/cgi/pa_config_paths.h src/targets/cgi/Makefile src/targets/apache13/Makefile src/targets/apache13/p3runConfigure src/targets/isapi/Makefile etc/Makefile etc/parser3.charsets/Makefile bin/Makefile bin/auto.p.dist) |