* fix freebsd build.

diff --git a/webcit/Makefile.am b/webcit/Makefile.am
index 61fc5f146a39d4609443bca7f1af08776f57e263..57cfc782ff736f14634fa9eb8fd342491468dafc 100644 (file)
--- a/webcit/Makefile.am
+++ b/webcit/Makefile.am
@@ -1,7 +1,7 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-SUBDIRS= po src 
+SUBDIRS= po src
 
 EXTRA_DIST= autoconf/config.rpath autoconf/mkinstalldirs  m4/ChangeLog tiny_mce_DATA static_DATA
 ACLOCAL_AMFLAGS = -I m4

diff --git a/webcit/configure.in b/webcit/configure.in
index 3d820e2e912befae8157861d4500cb9018e55545..e2f7a15eb4b4d1a34ca6e1ecfdcd5b5f075447f1 100644 (file)
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 dnl AC_CONFIG_AUX_DIR([autoconf])
-AC_INIT(src/webserver.c)
+AC_INIT([webcit],[6.80],[uncensored.citadel.org])
 AC_GNU_SOURCE
 AM_INIT_AUTOMAKE(webcit,6.72)
 AM_CONFIG_HEADER(config.h)
@@ -95,6 +95,7 @@ if test "$LIBS" != -pthread; then
        AC_CHECK_LIB(pthread, pthread_create)
        AC_CHECK_LIB(pthreads, pthread_create)
 fi
+AC_CHECK_LIB(iconv, libiconv, [LIBS="$LIBS -liconv"])   
 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(connect, socket)
 
@@ -385,8 +386,40 @@ AM_GNU_GETTEXT_VERSION([0.14])
 
 #AM_GNU_GETTEXT
 # if we have intl/... 
-AM_GNU_GETTEXT([external])
 IT_PROG_INTLTOOL
+AC_TRY_COMPILE([#include <locale.h>],
+                       [ extern locale_t wc_locales[]],
+                       [
+                       _nls_avail=yes
+                       AM_GNU_GETTEXT([external],[need-ngettext])
+                       ],
+                       [_nls_avail=no])
+
+
+
+
+                       
+
+dnl 
+dnl 
+dnl AC_TRY_RUN([
+dnl #include <libintl.h>
+dnl #include <locale.h>
+dnl int main(void)
+dnl {
+dnl    extern locale_t wc_locales[];
+dnl    return 1;
+dnl }
+dnl ],
+dnl                            [
+dnl                                    found_crypto=1
+dnl                                    break;
+dnl                            ], []
+dnl                    )
+dnl 
+
+
+
 
 AC_SUBST(CFLAGS)
 AC_SUBST(SETUP_LIBS)
@@ -413,10 +446,11 @@ AC_DEFINE_UNQUOTED([EDITORDIR],["$editordir"],[where find the editor (tiny_mce)?
 
 
 
-AC_OUTPUT(Makefile src/Makefile po/Makefile.in   )
+AC_OUTPUT(Makefile src/Makefile po/Makefile.in)
 
 
 echo ------------------------------------------------------------------------
+echo 'nls is available? '$_nls_avail
 echo 'zlib compression:                ' $ok_zlib
 echo 'Calendar support:                ' $ok_libical
 echo 'Character set conversion support:' $ok_iconv

diff --git a/webcit/src/Makefile.am b/webcit/src/Makefile.am
index dcc06206d2d4e81519cf31628ffa578f3ae74e7d..ec5a012d1b05ba83ff6dc4198a6f327f48206d97 100644 (file)
--- a/webcit/src/Makefile.am
+++ b/webcit/src/Makefile.am
@@ -15,7 +15,7 @@ AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\"
 
 
 
-LIBS = @LTLIBINTL@ @LIBS@ @LTLIBICONV@
+LIBS = @LIBINTL@ @LIBS@ 
 #INCLUDES = 
 
 
@@ -25,7 +25,9 @@ LIBS = @LTLIBINTL@ @LIBS@ @LTLIBICONV@
 
 sbin_PROGRAMS = webserver setup
 
-webserver_LDADD = @LIBINTL@
+webserver_LDADD = @LIBINTL@ 
+#$(ICONVLIBS)
+#@LIBICONV@
 setup_LDADD = @SETUP_LIBS@
 #SUBDIRS = $(LIB_SUBDIRS) $(PROG_SUBDIRS) 
 setup_SOURCES = setup.c tools.c