X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fconfigure.ac;h=810aabea64d8204c833e8a9b2fd4fb1f1661166c;hb=HEAD;hp=ac631f331394e0eb3baa796cb49af93409aedec4;hpb=1a4ec92c7186ed2c0b9b6bf45afc47b69f3a800a;p=citadel.git diff --git a/webcit/configure.ac b/webcit/configure.ac index ac631f331..7ffaf142b 100644 --- a/webcit/configure.ac +++ b/webcit/configure.ac @@ -1,7 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ -AC_INIT([WebCit], [902], [http://www.citadel.org/]) - +AC_INIT([WebCit],[m4_esyscmd_s(cat package-version.txt)],[http://uncensored.citadel.org]) AC_SUBST(PROG_SUBDIRS) AC_DEFINE(PROG_SUBDIRS, [], [Program dirs]) @@ -12,7 +11,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) dnl Make sure we see all GNU and Solaris extensions. -AC_GNU_SOURCE +AC_USE_SYSTEM_EXTENSIONS AC_CHECK_PROG(SED, sed, sed, no) AC_PREFIX_DEFAULT(/usr/local/webcit) @@ -85,24 +84,29 @@ AC_SEARCH_LIBS(gethostbyname, nsl) AC_SEARCH_LIBS(connect, socket) dnl Checks for header files. -AC_HEADER_STDC +m4_warn([obsolete], +[The preprocessor macro `STDC_HEADERS' is obsolete. + Except in unusual embedded environments, you can safely include all + ISO C90 headers unconditionally.])dnl +# Autoupdate added the next two lines to ensure that your configure +# script's behavior did not change. They are probably safe to remove. +AC_CHECK_INCLUDES_DEFAULT +AC_PROG_EGREP + dnl AC_HEADER_SYS_WAIT AC_CHECK_FUNCS(crypt gethostbyname connect flock getpwnam_r getpwuid_r getloadavg) AC_CACHE_CHECK( [for call semantics from getpwuid_r], ac_cv_call_getpwuid_r, - [AC_TRY_COMPILE([#include -#include ], - [ + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include +#include ]], [[ struct passwd pw, *pwp; char pwbuf[64]; uid_t uid; getpwuid_r(uid, &pw, pwbuf, sizeof(pwbuf), &pwp); - ], - ac_cv_call_getpwuid_r=yes, - ac_cv_call_getpwuid_r=no) + ]])],[ac_cv_call_getpwuid_r=yes],[ac_cv_call_getpwuid_r=no]) ]) if test $ac_cv_call_getpwuid_r = no; then @@ -130,10 +134,21 @@ AC_CHECK_SIZEOF(int, 0) AC_CHECK_SIZEOF(long, 0) AC_CHECK_SIZEOF(long unsigned int, 0) AC_CHECK_SIZEOF(size_t, 0) -dnl AC_HEADER_TIME dnl Checks for library functions. -AC_TYPE_SIGNAL +m4_warn([obsolete], +[your code may safely assume C89 semantics that RETSIGTYPE is void. +Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl +AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE( +[AC_LANG_PROGRAM([#include +#include +], + [return *(signal (0, 0)) (0) == 1;])], + [ac_cv_type_signal=int], + [ac_cv_type_signal=void])]) +AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers + (`int' or `void').]) + dnl AC_FUNC_VPRINTF AC_REPLACE_FUNCS(snprintf) AC_CHECK_HEADER(CUnit/CUnit.h, [AC_DEFINE(ENABLE_TESTS, [], [whether we should compile the test-suite])]) @@ -165,7 +180,7 @@ AC_ARG_ENABLE(iconv, ok_iconv=no, ok_iconv=yes) AC_MSG_CHECKING(Checking to see if your system supports iconv) -AC_TRY_RUN([ +AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include main() { iconv_t ic = (iconv_t)(-1) ; @@ -173,40 +188,36 @@ AC_TRY_RUN([ iconv_close(ic); exit(0); } - ], - [ + ]])],[ ok_iconv=yes AC_MSG_RESULT([yes]) - ], - [ + ],[ ok_iconv=no AC_MSG_RESULT([no]) - ] -) + +],[]) dnl Check for iconv in external libiconv if test "$ok_iconv" = no; then AC_MSG_CHECKING(Checking for an external libiconv) OLD_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -liconv" - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include main() { iconv_t ic = (iconv_t)(-1) ; ic = iconv_open("UTF-8", "us-ascii"); iconv_close(ic); } - ], - [ + ]])],[ ok_iconv=yes AC_MSG_RESULT([yes]) - ], - [ + ],[ ok_iconv=no LDFLAGS="$OLD_LDFLAGS" AC_MSG_RESULT([no]) - ] - ) + + ],[]) fi if test "$ok_iconv" != "no"; then AC_MSG_RESULT(webcit will be built with character set conversion.) @@ -215,7 +226,6 @@ else AC_MSG_RESULT(webcit will be built without character set conversion.) fi - AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"]) @@ -261,7 +271,7 @@ AC_CHECK_HEADER(libcitadel.h, ) AC_MSG_CHECKING([whether your system likes memcpy + HKEY]) -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #define _GNU_SOURCE #include #include @@ -274,21 +284,18 @@ AC_TRY_COMPILE([ #include #include "lib/libcitadel.h" -], -[ +]], [[ char foo[22]; memcpy(foo, HKEY("foo")); -], - [ +]])],[ AC_MSG_RESULT([yes]) - ], - [ + ],[ AC_DEFINE(UNDEF_MEMCPY, [], [whether we need to undefine memcpy]) AC_MSG_RESULT([no]) - ] -) + +]) dnl Checks for the Expat XML parser. AC_CHECK_HEADER(expat.h, @@ -352,8 +359,7 @@ if test "$with_ssl" != "no"; then # Basic test to check for compatible version and correct linking # *does not* test for RSA - that comes later. - AC_TRY_RUN( - [ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include int main(void) @@ -363,12 +369,11 @@ if test "$with_ssl" != "no"; then RAND_add(a, sizeof(a), sizeof(a)); return(RAND_status() <= 0); } - ], - [ + ]])],[ found_crypto=1 break; - ], [] - ) + ],[ + ],[]) if test ! -z "$found_crypto" ; then break; @@ -494,7 +499,6 @@ if test "$prefix" = NONE; then wwwdir=$ac_default_prefix rundir=$ac_default_prefix editordir=$ac_default_prefix/tiny_mce - markdowneditordir=$ac_default_prefix/epic etcdir=$ac_default_prefix else localedir=$prefix @@ -502,7 +506,6 @@ else datadir=$prefix rundir=$prefix editordir=$prefix/tiny_mce - markdowneditordir=$prefix/epic etcdir=$prefix fi @@ -562,16 +565,6 @@ AC_ARG_WITH(editordir, fi ] ) -AC_DEFINE_UNQUOTED(EDITORDIR, "$editordir", [where to find our mail editor]) - -AC_ARG_WITH(markdowneditordir, - [ --with-markdowneditordir directory to put our markdown editor], - [ if test "x$withval" != "xno" ; then - markdowneditordir=$withval - fi - ] -) -AC_DEFINE_UNQUOTED(MARKDOWNEDITORDIR, "$markdowneditordir", [where to find our markdown editor]) dnl Checks where to find our configs AC_ARG_WITH(etcdir, @@ -590,13 +583,13 @@ abs_builddir="`pwd`" if test "$abs_srcdir" != "$abs_builddir"; then CFLAGS="$CFLAGS -I $abs_builddir" fi -AC_CONFIG_HEADER(sysdep.h) -AC_OUTPUT(Makefile po/webcit/Makefile tests/Makefile) +AC_CONFIG_HEADERS([sysdep.h]) +AC_CONFIG_FILES([Makefile po/webcit/Makefile]) +AC_OUTPUT if test "$abs_srcdir" != "$abs_builddir"; then ln -s $abs_srcdir/static $abs_builddir ln -s $abs_srcdir/tiny_mce $abs_builddir - ln -s $abs_srcdir/epic $abs_builddir ln -s $abs_srcdir/*.h $abs_builddir make mkdir-init