* Threw away most of the gettextize-generated build system in the po/

[citadel.git] / webcit / configure.in

diff --git a/webcit/configure.in b/webcit/configure.in
index e7ce5e74f05299facd7433ae591186262a1c9fc1..33679ea87cb1a2770a579040792f909e22361419 100644 (file)
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -2,14 +2,22 @@ dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_INIT(webserver.c)
 
+
+PACKAGE=webcit
+VERSION=6.21
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+
 AC_CANONICAL_HOST
 AC_PROG_INSTALL
+AC_CHECK_PROG(SED, sed, sed, no)
 AC_PREFIX_DEFAULT(/usr/local/webcit)
 
-AC_ARG_WITH(with_libical, [  --with-libical          use libical calendaring library])
-AC_ARG_WITH(with_zlib, [  --with-zlib          use zlib compression if present])
-AC_ARG_WITH(with_libconv, [  --with-libiconv         use libiconv character set conversion if present])
-AC_ARG_WITH(with_newt, [  --with-newt          use newt window library])
+AC_ARG_WITH(with_libical, [  --with-libical      use libical calendaring library])
+AC_ARG_WITH(with_zlib,    [  --with-zlib         use zlib compression if present])
+AC_ARG_WITH(with_newt,    [  --with-newt         use newt window library])
 AC_ARG_WITH(ssl,
        [  --with-ssl=PATH     Specify path to OpenSSL installation ],
        [
@@ -71,6 +79,9 @@ AC_HEADER_STDC
 dnl AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h)
 
+
+
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_OFF_T
@@ -132,21 +143,6 @@ if test "x$ok_zlib" = xyes ; then
         AC_DEFINE(HAVE_ZLIB)
 fi
 
-
-dnl Checks for the libiconv charset conversion library.
-if test "x$with_libiconv" != xno ; then
-        AC_CHECK_HEADERS(iconv.h,
-                [AC_CHECK_LIB(iconv, iconv_open,
-                        [ok_libiconv=yes],,
-        )])
-fi
-
-if test "x$ok_libiconv" = xyes ; then
-        LIBS="-liconv $LIBS"
-        AC_DEFINE(HAVE_ICONV)
-fi
-
-
 dnl Checks for the newt window library.
 if test "x$with_newt" != xno ; then
        AC_CHECK_HEADERS(newt.h,
@@ -270,9 +266,9 @@ if test "$with_ssl" != "no"; then
        fi
 fi
 
-
+AM_GNU_GETTEXT
 
 AC_SUBST(SETUP_LIBS)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile intl/Makefile po/Makefile.in po/Makefile )