dnl Process this file with autoconf to produce a configure script.
dnl $Id$
-AC_INIT([WebCit], [7.24], [http://www.citadel.org/])
+AC_INIT([WebCit], [7.34], [http://www.citadel.org/])
AC_SUBST(PROG_SUBDIRS)
AC_DEFINE(PROG_SUBDIRS, [], [Program dirs])
dnl Checks for header files.
AC_HEADER_STDC
dnl AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h)
AC_TYPE_SIGNAL
dnl AC_FUNC_VPRINTF
AC_REPLACE_FUNCS(snprintf)
+AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h iconv.h)
+
+
+dnl Here is the check for a libc integrated iconv
+AC_ARG_ENABLE(iconv,
+ [ --disable-iconv do not use iconv charset conversion],
+ ok_iconv=no, ok_iconv=yes)
+
+AC_MSG_CHECKING(Checking to see if your system supports iconv)
+AC_TRY_RUN([
+ #include <iconv.h>
+ main() {
+ iconv_t ic = (iconv_t)(-1) ;
+ ic = iconv_open("UTF-8", "us-ascii");
+ 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([
+ #include <iconv.h>
+ 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=$OLDLDFLAGS
+ AC_MSG_RESULT([no])
+ ]
+ )
+fi
+if test "$ok_iconv" != "no"; then
+ AC_MSG_RESULT(WebCit will be built with character set conversion.)
+ AC_DEFINE(HAVE_ICONV,[],[whether we have iconv for charset conversion])
+else
+ AC_MSG_RESULT(WebCit will be built without character set conversion.)
+fi
+
+AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"])
+
dnl Check for libcitadel
AC_CHECK_HEADER(libcitadel.h,
[AC_CHECK_LIB(citadel, libcitadel_version_string,
[
- AC_MSG_RESULT(OK)
LIBS="-lcitadel $LIBS"
],
[
)
AC_DEFINE_UNQUOTED(SSL_DIR, "$ssl_dir", [were should we put our keys?])
-dnl Here is the check for a usable iconv
-
-AC_ARG_ENABLE(iconv,
- [ --disable-iconv do not use iconv charset conversion],
- ok_iconv=no, ok_iconv=yes)
-
-if test "$ok_nls" != "no"; then
- AC_MSG_RESULT(Checking to see if your system supports iconv...)
- AC_TRY_RUN([
- #include <iconv.h>
- main() {
- iconv_t ic = (iconv_t)(-1) ;
- ic = iconv_open("UTF-8", "us-ascii");
- iconv_close(ic);
- exit(0);
- }
- ],
- ok_iconv=yes,
- ok_iconv=no
- )
-fi
-
-if test "$ok_iconv" = "no"; then
- LD_FLAGS_BEFORE=$LDFLAGS
- LDFLAGS="$LDFLAGS -liconv"
- AC_TRY_RUN([
- #include <iconv.h>
- main() {
- iconv_t ic = (iconv_t)(-1) ;
- ic = iconv_open("UTF-8", "us-ascii");
- iconv_close(ic);
- exit(0);
- }
- ],
- ok_iconv=yes,
- ok_iconv=no
- )
- if test "$ok_iconv" != "no"; then
- LDFLAGS=$LD_FLAGS_BEFORE
- LIBS="$LIBS -liconv"
- fi
-fi
-
-if test "$ok_iconv" != "no"; then
- AC_MSG_RESULT(WebCit will be built with character set conversion.)
- AC_DEFINE(HAVE_ICONV,[],[whether we have iconv for charset conversion])
-else
- AC_MSG_RESULT(WebCit will be built without character set conversion.)
-fi
-dnl Here is the check for libintl etc.
-
-AC_ARG_ENABLE(nls,
- [ --disable-nls do not use Native Language Support],
- ok_nls=no, ok_nls=yes)
-
-if test "$ok_nls" != "no"; then
- AC_MSG_RESULT(Checking for per-thread NLS support...)
- AC_TRY_RUN([
- #define _GNU_SOURCE
- #include <libintl.h>
- #include <locale.h>
- #include <time.h>
- main() {
- char *foo = NULL;
- char baz[32];
- struct tm *tm;
- uselocale(LC_GLOBAL_LOCALE);
- foo = gettext("bar");
- if (0) {
- strftime_l(baz, sizeof baz, "%c", tm, LC_GLOBAL_LOCALE);
- }
- exit(0);
- }
- ],
- ok_uselocale=yes,
- ok_uselocale=no
- )
- ok_nls=$ok_uselocale
-fi
+AC_CHECK_FUNCS(strftime_l uselocale gettext)
if test "$ok_nls" != "no"; then
AC_CHECK_PROG(ok_xgettext, xgettext, yes, no)