added Automaked makefiles.
authorWilfried Göesgens <willi@citadel.org>
Sun, 12 Mar 2006 12:03:13 +0000 (12:03 +0000)
committerWilfried Göesgens <willi@citadel.org>
Sun, 12 Mar 2006 12:03:13 +0000 (12:03 +0000)
webcit/Makefile.am [new file with mode: 0644]
webcit/Makefile.in [deleted file]
webcit/configure.in
webcit/po/Makefile.in [deleted file]
webcit/po/Makefile.in.in [new file with mode: 0644]
webcit/src/Makefile.am [new file with mode: 0644]

diff --git a/webcit/Makefile.am b/webcit/Makefile.am
new file mode 100644 (file)
index 0000000..5672f13
--- /dev/null
@@ -0,0 +1,35 @@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SUBDIRS= po src 
+
+EXTRA_DIST= autoconf/config.rpath autoconf/mkinstalldirs  m4/ChangeLog tiny_mce_DATA static_DATA
+ACLOCAL_AMFLAGS = -I m4
+
+DISTFILES=ABOUT_NLS
+# usual unix way would be here: $(datadir)/$(PACKAGE)
+#STATIC_DIR=@STATIC_DIR@
+
+DIRS=tiny_mce static
+
+
+
+
+install-data-local:
+               @$(NORMAL_INSTALL); \
+               if test -n "@STATIC_DIR@" ; then \
+                       export STATIC_DIR=@STATIC_DIR@; \
+               else \
+                       export STATIC_DIR=$(prefix); \
+               fi; \
+               for dir in $(DIRS); do \
+                       $(mkinstalldirs) $(DESTDIR)/$$STATIC_DIR/$$dir; \
+                       for subdir in `find $$dir -type d |grep -v .svn`; do \
+                               $(mkinstalldirs) $(DESTDIR)/$$STATIC_DIR/$$subdir; \
+                                       for file in $(srcdir)/$$subdir/*; do \
+                                               if test -f "$$file" ; then \
+                                                       $(INSTALL_DATA) $$file $(DESTDIR)$$STATIC_DIR/$$subdir; \
+                                               fi \
+                                       done \
+                       done \
+               done
diff --git a/webcit/Makefile.in b/webcit/Makefile.in
deleted file mode 100644 (file)
index d5508a6..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-# $Id$
-
-AUTOCONF=@AUTOCONF@
-CC=@CC@
-CFLAGS=@CFLAGS@
-DEFS=@DEFS@
-INSTALL=@INSTALL@
-LIBOBJS=@LIBOBJS@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@
-SED=@SED@
-SETUP_LIBS=@SETUP_LIBS@
-PTHREAD_DEFS=@PTHREAD_DEFS@
-srcdir=@srcdir@
-prefix=@prefix@
-top_builddir=`pwd`
-
-LIB_SUBDIRS=
-PROG_SUBDIRS=@PROG_SUBDIRS@
-SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
-
-# End of configuration section
-
-all: all-progs-recursive webserver setup
-
-
-.SUFFIXES: .cpp .c .o
-
-clean:
-       rm -f *.o webcit webserver
-       rm -fr locale/*
-
-distclean: clean
-       rm -f Makefile config.cache config.log config.status \
-               po/Makefile \
-               $(srcdir)/TAGS
-
-setup: setup.o tools.o
-       $(CC) setup.o tools.o \
-       $(LIBOBJS) $(LIBS) $(LDFLAGS) $(SETUP_LIBS) -o setup
-
-webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
-       cookie_conversion.o locate_host.o floors.o summary.o \
-       webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \
-       roomops.o messages.o userlist.o paging.o sysmsgs.o useredit.o \
-       vcard.o vcard_edit.o preferences.o html2html.o listsub.o \
-       mime_parser.o graphics.o netconf.o siteconfig.o subst.o rss.o \
-       calendar.o calendar_tools.o calendar_view.o event.o \
-       availability.o iconbar.o crypto.o inetconf.o notes.o wiki.o \
-       groupdav_main.o groupdav_get.o groupdav_propfind.o fmt_date.o \
-       groupdav_options.o autocompletion.o gettext.o tabs.o \
-       groupdav_delete.o groupdav_put.o http_datestring.o setup_wizard.o \
-       $(LIBOBJS)
-       $(CC) webserver.o context_loop.o tools.o cookie_conversion.o \
-       webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o listsub.o \
-       roomops.o messages.o userlist.o paging.o sysmsgs.o useredit.o \
-       locate_host.o siteconfig.o subst.o vcard.o vcard_edit.o floors.o \
-       mime_parser.o graphics.o netconf.o preferences.o html2html.o rss.o \
-       summary.o calendar.o calendar_tools.o calendar_view.o event.o wiki.o \
-       availability.o ical_dezonify.o iconbar.o crypto.o inetconf.o notes.o \
-       groupdav_main.o groupdav_get.o groupdav_propfind.o groupdav_delete.o \
-       groupdav_options.o autocompletion.o tabs.o \
-       groupdav_put.o http_datestring.o setup_wizard.o fmt_date.o \
-       gettext.o \
-       $(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
-
-.c.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\" $<
-
-.cpp.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\" $<
-
-Makefile: $(srcdir)/Makefile.in config.status
-       CONFIG_FILES="Makefile" CONFIG_HEADERS= $(SHELL) ./config.status
-
-config.status: $(srcdir)/configure
-       $(SHELL) ./config.status --recheck
-
-$(srcdir)/configure: $(srcdir)/configure.in
-       cd $(srcdir) && $(AUTOCONF)
-
-install:
-       test -d $(root)$(prefix) || mkdir $(root)$(prefix)
-       test -d $(root)$(prefix)/static || mkdir $(root)$(prefix)/static
-       for i in `find tiny_mce -type d | grep -v .svn` \
-               ; do \
-               test -d $(root)$(prefix)/$$i || mkdir $(root)$(prefix)/$$i; \
-       done
-       for i in `find locale -type d | grep -v .svn` \
-               ; do \
-               test -d $(root)$(prefix)/$$i || mkdir $(root)$(prefix)/$$i; \
-       done
-       for i in \
-               webserver \
-               setup \
-               `find static -type f | grep -v .svn` \
-               `find tiny_mce -type f | grep -v .svn` \
-               `find locale -type f | grep -v .svn` \
-               ; do \
-               $(INSTALL) $$i $(root)$(prefix)/$$i; \
-       done
-
-TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
-  mostlyclean-recursive realclean-recursive:
-       @for subdir in $(SUBDIRS); do \
-         if test -d $$subdir ; then \
-           target=`echo $@|$(SED) 's/-recursive//'`; \
-           echo making $$target in $$subdir; \
-           (cd $$subdir && $(MAKE) $$target) || exit 1; \
-         fi ; \
-       done
-
-all-progs-recursive install-progs-recursive install-strip-progs-recursive \
-  uninstall-progs-recursive:
-       @for subdir in $(PROG_SUBDIRS); do \
-         if test -d $$subdir ; then \
-           target=`echo $@|$(SED) 's/-progs-recursive//'`; \
-           echo making $$target in $$subdir; \
-           (cd $$subdir && $(MAKE) $$target) || exit 1; \
-         fi ; \
-       done
-
-all-libs-recursive install-libs-recursive install-strip-libs-recursive \
-  uninstall-libs-recursive install-shlibs-libs-recursive \
-  install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive:
-       @for subdir in $(LIB_SUBDIRS); do \
-         if test -d $$subdir ; then \
-           target=`echo $@|$(SED) 's/-libs-recursive//'`; \
-           echo making $$target in $$subdir; \
-           (cd $$subdir && $(MAKE) $$target) || exit 1; \
-         fi ; \
-       done
-
index 6a863d8eeacdb17b83db3087a2e5d5bf1758940e..6991c919bccf31445706965bb95aca8bfdc346aa 100644 (file)
@@ -1,33 +1,53 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
-AC_INIT(webserver.c)
-
-
-PACKAGE=webcit
-VERSION=6.72
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
+dnl AC_CONFIG_AUX_DIR([autoconf])
+AC_INIT(src/webserver.c)
+AM_INIT_AUTOMAKE(webcit,6.72)
+AM_CONFIG_HEADER(config.h)
+AC_PROG_LIBTOOL
+#AC_CONFIG_HEADERS(sysdep.h)
+#AC_VERSION(6.72)
+#PACKAGE=gettext
+#VERSION=0.14.5
+#AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+#AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+#AC_SUBST(PACKAGE)
+#AC_SUBST(VERSION)
+#AM_INIT_AUTOMAKE(gettext, 0.14.5)
 
 AC_SUBST(PROG_SUBDIRS)
-AC_CANONICAL_HOST
+#AC_CANONICAL_HOST
 AC_PROG_INSTALL
 AC_CHECK_PROG(AUTOCONF, autoconf)
 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_newt,    [  --with-newt             use newt window library])
-AC_ARG_WITH(ssl,
+#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 ],
+#      [
+#              if test "x$withval" != "xno" ; then
+#                      tryssldir=$withval
+#              fi
+#      ]
+#)
+#AC_DEFINE([HAVE_ICAL], [  --with-libical          use libical calendaring library])
+AC_DEFINE([HAVE_ZLIB],    [  --with-zlib             use zlib compression if present],ok_zlib=no, ok_zlib=yes)
+AC_DEFINE([HAVE_OPENSSL],
        [  --with-ssl=PATH         Specify path to OpenSSL installation ],
+       ssl_ok=no,
        [
                if test "x$withval" != "xno" ; then
                        tryssldir=$withval
                fi
+               ssl_ok=yes
        ]
 )
+
+AC_DEFINE([WEBCITDIR],"/usr/local/webcit",    [  --with-webcitdir             Directory Prefix])
+
 dnl Set some system-specific variables which are OK to set before compiler
 dnl checks:
 PTHREAD_DEFS=-D_REENTRANT
@@ -93,15 +113,18 @@ dnl AC_HEADER_TIME
 dnl Checks for library functions.
 AC_TYPE_SIGNAL
 dnl AC_FUNC_VPRINTF
-dnl AC_CHECK_FUNCS(strerror)
+AC_CHECK_FUNCS(backtrace)
 AC_REPLACE_FUNCS(snprintf)
 
 dnl Checks for the libical calendaring library.
+AC_DEFINE([HAVE_LIBICAL], 
+          [--with-libical          use libical calendaring library],
+                 ok_libical=no, ok_libical=yes)
+
 if test "x$with_libical" != xno ; then
-        AC_CHECK_HEADERS(ical.h,
-                [AC_CHECK_LIB(ical, icalcomponent_new,
-                        [ok_libical=yes],,
-        )])
+                 AC_CHECK_HEADERS(ical.h,
+                                    [AC_CHECK_LIB(ical, icalcomponent_new,
+                                   [ok_libical=yes],,)])
 fi
 
 if test "x$ok_libical" = xyes ; then
@@ -146,17 +169,24 @@ if test "x$ok_zlib" = xyes ; then
 fi
 
 dnl Checks for the newt window library.
-if test "x$with_newt" != xno ; then
-       AC_CHECK_HEADERS(newt.h,
-               [AC_CHECK_LIB(newt, newtInit,
-                       [ok_newt=yes],,
-       )])
-fi
+dnl#if test "x$with_newt" != xno ; then
 
-if test "x$ok_newt" = xyes ; then
-       SETUP_LIBS="-lnewt $SETUP_LIBS"
-       AC_DEFINE(HAVE_NEWT)
-fi
+dnl AC_DEFINE([HAVE_NEWT],
+dnl              [  --with-newt             use newt window library],ok_newt=no, 
+dnl          [AC_CHECK_HEADERS(newt.h,
+dnl                                [AC_CHECK_LIB(newt, newtInit,
+dnl                                                  [ok_newt=yes],[ok_newt=no],
+dnl                                          )
+dnl                                                    ])
+dnl              ] 
+dnl )
+
+dnl    ok_newt=yes
+
+dnl if test "x$ok_newt" = xyes ; then
+dnl    SETUP_LIBS="-lnewt $SETUP_LIBS"
+dnl    AC_DEFINE(HAVE_NEWT)
+dnl fi
 
 # The big search for OpenSSL
 if test "$with_ssl" != "no"; then
@@ -270,7 +300,7 @@ fi
 
 dnl Here is the check for a usable iconv
 
-AC_ARG_ENABLE(iconv,
+AC_DEFINE([HAVE_ICONV],
        [  --disable-iconv         do not use iconv charset conversion],
        ok_iconv=no, ok_iconv=yes)
 
@@ -299,63 +329,79 @@ 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
+dnl dnl Here is the check for libintl etc.
+dnl 
+dnl AC_DEFINE([ENABLE_NLS],
+dnl    [  --disable-nls           do not use Native Language Support],
+dnl    ok_nls=no, ok_nls=yes)
+dnl 
+dnl if test "$ok_nls" != "no"; then
+dnl    AC_MSG_RESULT(Checking for per-thread NLS support...)
+dnl    AC_TRY_RUN([
+dnl                 #define _GNU_SOURCE
+dnl                 #include <libintl.h>
+dnl                 #include <locale.h>
+dnl                 #include <time.h>
+dnl                 main() {
+dnl                         char *foo = NULL;
+dnl                         char baz[32];
+dnl                    struct tm *tm;
+dnl                         uselocale(LC_GLOBAL_LOCALE);
+dnl                         foo = gettext("bar");
+dnl                    if (0) {
+dnl                            strftime_l(baz, sizeof baz, "%c", tm, LC_GLOBAL_LOCALE);
+dnl                    }
+dnl                         exit(0);
+dnl            }
+dnl    ],
+dnl            ok_uselocale=yes,
+dnl            ok_uselocale=no
+dnl    )
+dnl    ok_nls=$ok_uselocale
+dnl fi
+dnl 
+dnl if test "$ok_nls" != "no"; then
+dnl    AC_CHECK_PROG(ok_xgettext, xgettext, yes, no)
+dnl    ok_nls=$ok_xgettext
+dnl fi
+dnl 
+dnl if test "$ok_nls" != "no"; then
+dnl    AC_CHECK_PROG(ok_msgmerge, msgmerge, yes, no)
+dnl    ok_nls=$ok_msgmerge
+dnl fi
+dnl 
+dnl if test "$ok_nls" != "no"; then
+dnl    AC_CHECK_PROG(ok_msgfmt, msgfmt, yes, no)
+dnl    ok_nls=$ok_msgfmt
+dnl fi
+dnl 
+dnl if test "$ok_nls" != "no"; then
+dnl    AC_MSG_RESULT(WebCit will be built with national language support.)
+dnl    AC_DEFINE(ENABLE_NLS)
+dnl     CFLAGS="$CFLAGS -I\$(top_srcdir)/po"
+dnl    PROG_SUBDIRS="$PROG_SUBDIRS po"
+dnl    AC_CHECK_LIB(intl, gettext)
+dnl else
+dnl    AC_MSG_RESULT(WebCit will be built without national language support.)
+dnl fi
+dnl Checks for programs.
+AM_GNU_GETTEXT_VERSION([0.14.5])
 
-if test "$ok_nls" != "no"; then
-       AC_CHECK_PROG(ok_xgettext, xgettext, yes, no)
-       ok_nls=$ok_xgettext
-fi
+#AM_GNU_GETTEXT
+# if we have intl/... 
+AM_GNU_GETTEXT([external])
+IT_PROG_INTLTOOL
 
-if test "$ok_nls" != "no"; then
-       AC_CHECK_PROG(ok_msgmerge, msgmerge, yes, no)
-       ok_nls=$ok_msgmerge
-fi
+AC_SUBST(CFLAGS)
+AC_SUBST(SETUP_LIBS)
 
-if test "$ok_nls" != "no"; then
-       AC_CHECK_PROG(ok_msgfmt, msgfmt, yes, no)
-       ok_nls=$ok_msgfmt
-fi
 
-if test "$ok_nls" != "no"; then
-       AC_MSG_RESULT(WebCit will be built with national language support.)
-       AC_DEFINE(ENABLE_NLS)
-       PROG_SUBDIRS="$PROG_SUBDIRS po"
-else
-       AC_MSG_RESULT(WebCit will be built without national language support.)
-fi
+STATIC_DIR=
 
-AC_SUBST(SETUP_LIBS)
+AC_ARG_WITH(with_staticdir, [  --with-staticdir          where to put datafiles])
 
-AC_OUTPUT(Makefile po/Makefile )
+AC_SUBST(STATIC_DIR)
+AC_OUTPUT(Makefile src/Makefile po/Makefile.in   )
 
 echo ------------------------------------------------------------------------
 echo 'zlib compression:                ' $ok_zlib
diff --git a/webcit/po/Makefile.in b/webcit/po/Makefile.in
deleted file mode 100644 (file)
index 3997649..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-all: ../locale/de/LC_MESSAGES/webcit.mo \
-       ../locale/it/LC_MESSAGES/webcit.mo \
-       ../locale/en_GB/LC_MESSAGES/webcit.mo
-
-../locale/de/LC_MESSAGES/webcit.mo: de.po
-       [ -d ../locale/de/LC_MESSAGES ] || mkdir -p ../locale/de/LC_MESSAGES
-       msgfmt de.po -o ../locale/de/LC_MESSAGES/webcit.mo
-
-../locale/it/LC_MESSAGES/webcit.mo: it.po
-       [ -d ../locale/it/LC_MESSAGES ] || mkdir -p ../locale/it/LC_MESSAGES
-       msgfmt it.po -o ../locale/it/LC_MESSAGES/webcit.mo
-
-../locale/en_GB/LC_MESSAGES/webcit.mo: en_GB.po
-       [ -d ../locale/en_GB/LC_MESSAGES ] || mkdir -p ../locale/en_GB/LC_MESSAGES
-       msgfmt en_GB.po -o ../locale/en_GB/LC_MESSAGES/webcit.mo
-
diff --git a/webcit/po/Makefile.in.in b/webcit/po/Makefile.in.in
new file mode 100644 (file)
index 0000000..969a9c0
--- /dev/null
@@ -0,0 +1,384 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.14.4
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+localedir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+       @echo "$(MSGFMT) -c -o $@ $<"; \
+       $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+       @lang=`echo $* | sed -e 's,.*/,,'`; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+       cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+       sed -e '/^#/d' $< > t-$@
+       mv t-$@ $@
+
+
+all: all-@USE_NLS@
+
+all-yes: stamp-po $(CATALOGS)
+all-no:
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+       test ! -f $(srcdir)/$(DOMAIN).pot || \
+         test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+       @test ! -f $(srcdir)/$(DOMAIN).pot || { \
+         echo "touch stamp-po" && \
+         echo timestamp > stamp-poT && \
+         mv stamp-poT stamp-po; \
+       }
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+       if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+         msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+       else \
+         msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+       fi; \
+       $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+         --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+         --files-from=$(srcdir)/POTFILES.in \
+         --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --msgid-bugs-address="$$msgid_bugs_address"
+       test ! -f $(DOMAIN).po || { \
+         if test -f $(srcdir)/$(DOMAIN).pot; then \
+           sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+           sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+           if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+             rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+           else \
+             rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+             mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+           fi; \
+         else \
+           mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+         fi; \
+       }
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+       $(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+       @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+       if test -f "$(srcdir)/$${lang}.po"; then \
+         test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+         echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+         cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+       else \
+         $(MAKE) $${lang}.po-create; \
+       fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+         for file in $(DISTFILES.common) Makevars.template; do \
+           $(INSTALL_DATA) $(srcdir)/$$file \
+                           $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+         for file in Makevars; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+       else \
+         : ; \
+       fi
+install-data-no: all
+install-data-yes: all
+       $(mkinstalldirs) $(DESTDIR)$(datadir)
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         dir=$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkinstalldirs) $(DESTDIR)$$dir; \
+         if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+         $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+         echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+           if test -n "$$lc"; then \
+             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+               mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                for file in *; do \
+                  if test -f $$file; then \
+                    ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                  fi; \
+                done); \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             else \
+               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                 :; \
+               else \
+                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               fi; \
+             fi; \
+             rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+             ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+             ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+             cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+             echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+           fi; \
+         done; \
+       done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+       else \
+         : ; \
+       fi
+installdirs-data-no:
+installdirs-data-yes:
+       $(mkinstalldirs) $(DESTDIR)$(datadir)
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         dir=$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkinstalldirs) $(DESTDIR)$$dir; \
+         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+           if test -n "$$lc"; then \
+             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+               mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                for file in *; do \
+                  if test -f $$file; then \
+                    ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                  fi; \
+                done); \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             else \
+               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                 :; \
+               else \
+                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               fi; \
+             fi; \
+           fi; \
+         done; \
+       done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         for file in $(DISTFILES.common) Makevars.template; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+       else \
+         : ; \
+       fi
+uninstall-data-no:
+uninstall-data-yes:
+       catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+           rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+         done; \
+       done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+       rm -f remove-potcdate.sed
+       rm -f stamp-poT
+       rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+       rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+       rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+       @echo "This command is intended for maintainers to use;"
+       @echo "it deletes files that may require special tools to rebuild."
+       rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+       $(MAKE) update-po
+       @$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+       dists="$(DISTFILES)"; \
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         dists="$$dists Makevars.template"; \
+       fi; \
+       if test -f $(srcdir)/$(DOMAIN).pot; then \
+         dists="$$dists $(DOMAIN).pot stamp-po"; \
+       fi; \
+       if test -f $(srcdir)/ChangeLog; then \
+         dists="$$dists ChangeLog"; \
+       fi; \
+       for i in 0 1 2 3 4 5 6 7 8 9; do \
+         if test -f $(srcdir)/ChangeLog.$$i; then \
+           dists="$$dists ChangeLog.$$i"; \
+         fi; \
+       done; \
+       if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+       for file in $$dists; do \
+         if test -f $$file; then \
+           cp -p $$file $(distdir) || exit 1; \
+         else \
+           cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+         fi; \
+       done
+
+update-po: Makefile
+       $(MAKE) $(DOMAIN).pot-update
+       test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+       $(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+       @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+       echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+       exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+       @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+       if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+       tmpdir=`pwd`; \
+       echo "$$lang:"; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+       cd $(srcdir); \
+       if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+         if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+           rm -f $$tmpdir/$$lang.new.po; \
+         else \
+           if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+             :; \
+           else \
+             echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+             exit 1; \
+           fi; \
+         fi; \
+       else \
+         echo "msgmerge for $$lang.po failed!" 1>&2; \
+         rm -f $$tmpdir/$$lang.new.po; \
+       fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+       @:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+       cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+              $(SHELL) ./config.status
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/webcit/src/Makefile.am b/webcit/src/Makefile.am
new file mode 100644 (file)
index 0000000..3cf3596
--- /dev/null
@@ -0,0 +1,87 @@
+# $Id: Makefile.in 4225 2006-01-20 21:39:28Z ajc $
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+top_srcdir = @top_srcdir@
+
+
+datadir = @datadir@
+localedir = $(datadir)/locale
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+
+AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\"
+#  -Werror 
+#
+
+
+
+
+LIBS = @LTLIBINTL@
+#INCLUDES = 
+
+
+
+
+
+
+sbin_PROGRAMS = webserver setup
+
+webserver_LDADD = @LIBINTL@
+
+#SUBDIRS = $(LIB_SUBDIRS) $(PROG_SUBDIRS) 
+setup_SOURCES = setup.c tools.c
+
+webserver_SOURCES = \
+        context_loop.c \
+       tools.c \
+       ical_dezonify.c \
+       cookie_conversion.c \
+       locate_host.c \
+       floors.c \
+       summary.c \
+       webcit.c \
+       auth.c \
+       tcp_sockets.c \
+       mainmenu.c \
+       serv_func.c \
+       who.c \
+       roomops.c \
+       messages.c \
+       userlist.c \
+       paging.c \
+       sysmsgs.c \
+       useredit.c \
+       vcard.c \
+       vcard_edit.c \
+       preferences.c \
+       html2html.c \
+       listsub.c \
+       mime_parser.c \
+       graphics.c \
+       netconf.c \
+       siteconfig.c \
+       subst.c \
+       rss.c \
+       calendar.c \
+       calendar_tools.c \
+       calendar_view.c \
+       event.c \
+       availability.c \
+       iconbar.c \
+       crypto.c \
+       inetconf.c \
+       notes.c \
+       wiki.c \
+       groupdav_main.c \
+       groupdav_get.c \
+       groupdav_propfind.c \
+       fmt_date.c \
+       groupdav_options.c \
+       autocompletion.c \
+       gettext.c \
+       tabs.c \
+       groupdav_delete.c \
+       groupdav_put.c \
+       http_datestring.c \
+       setup_wizard.c \
+       webserver.c
+