From: Wilfried Göesgens Date: Tue, 14 Mar 2006 10:15:59 +0000 (+0000) Subject: * fixed debian build X-Git-Tag: v7.86~4117 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=ac65c8080aa1cf32756a314e0f7ff0eb52bce7e5 * fixed debian build * added autogen.sh, forgot that. --- diff --git a/webcit/Makefile.am b/webcit/Makefile.am index 5672f1319..12d055012 100644 --- a/webcit/Makefile.am +++ b/webcit/Makefile.am @@ -17,11 +17,7 @@ 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; \ + export STATIC_DIR=@staticdir@; \ for dir in $(DIRS); do \ $(mkinstalldirs) $(DESTDIR)/$$STATIC_DIR/$$dir; \ for subdir in `find $$dir -type d |grep -v .svn`; do \ diff --git a/webcit/autogen.sh b/webcit/autogen.sh new file mode 100755 index 000000000..6ce527df9 --- /dev/null +++ b/webcit/autogen.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# tool to generate the automaticaly provided stuff +intltoolize --force +autoreconf -i --force + diff --git a/webcit/configure.in b/webcit/configure.in index 6991c919b..33459dac7 100644 --- a/webcit/configure.in +++ b/webcit/configure.in @@ -34,7 +34,6 @@ AC_PREFIX_DEFAULT(/usr/local/webcit) # ] #) #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, @@ -156,37 +155,30 @@ fi dnl Checks for the zlib compression library. -if test "x$with_zlib" != xno ; then - AC_CHECK_HEADERS(zlib.h, - [AC_CHECK_LIB(z, zlibVersion, - [ok_zlib=yes],, - )]) -fi +AC_DEFINE([with_zlib], + [ --with-zlib use zlib compression if present], + [ok_zlib=no], + [AC_CHECK_HEADERS(zlib.h, + [AC_CHECK_LIB(z, zlibVersion, + [ok_zlib=yes],, + )]) + ]) if test "x$ok_zlib" = xyes ; then LIBS="-lz $LIBS" - AC_DEFINE(HAVE_ZLIB) fi dnl Checks for the newt window library. -dnl#if test "x$with_newt" != xno ; then - -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 +AC_ARG_WITH([ok_newt], [ --with-newt use newt window library],ok_newt=no, [ AC_CHECK_HEADERS(newt.h, + [AC_CHECK_LIB(newt, newtInit, + [ok_newt=yes],[ok_newt=no], + ) + ]) + ] +) +if test "x$ok_newt" = xyes ; then + SETUP_LIBS="-lnewt $SETUP_LIBS" +fi # The big search for OpenSSL if test "$with_ssl" != "no"; then @@ -396,11 +388,9 @@ AC_SUBST(CFLAGS) AC_SUBST(SETUP_LIBS) -STATIC_DIR= - -AC_ARG_WITH(with_staticdir, [ --with-staticdir where to put datafiles]) -AC_SUBST(STATIC_DIR) +AC_ARG_WITH(staticdir, [ --with-staticdir=DIR where to put datafiles],[ staticdir=$withval ],[ staticdir=$prefix/static/ ] ) +AC_SUBST(staticdir) AC_OUTPUT(Makefile src/Makefile po/Makefile.in ) echo ------------------------------------------------------------------------ diff --git a/webcit/debian/citadel-webcit.substvars b/webcit/debian/citadel-webcit.substvars index d0621723f..0fa59f41d 100644 --- a/webcit/debian/citadel-webcit.substvars +++ b/webcit/debian/citadel-webcit.substvars @@ -1,2 +1,2 @@ misc:Depends=debconf (>= 0.5) | debconf-2.0 -shlibs:Depends=libc6 (>= 2.3.5-1), libssl0.9.8 (>= 0.9.8a-1), zlib1g (>= 1:1.2.1) +shlibs:Depends=libc6 (>= 2.3.5-1), libssl0.9.8 (>= 0.9.8a-1) diff --git a/webcit/debian/docs b/webcit/debian/docs index 6e9fe653f..2e3abae30 100644 --- a/webcit/debian/docs +++ b/webcit/debian/docs @@ -1,3 +1,2 @@ -COPYING.txt -README.txt -README.txt +COPYING +README diff --git a/webcit/debian/rules b/webcit/debian/rules index d3d67d683..7fd18646e 100755 --- a/webcit/debian/rules +++ b/webcit/debian/rules @@ -23,13 +23,15 @@ endif configure: configure-stamp configure-stamp: dh_testdir + rm -rf $(CURDIR)/debian/webcit $(CURDIR)/debian/citadel-webcit $(CURDIR)/debian/citadel-webcit-apache CFLAGS="$(CFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/var/lib/citadel/www/ \ + --prefix=/usr \ + --with-webcit-dir=/usr \ --with-sysconfdir=/etc/citadel \ --with-spooldir=/var/spool/citadel \ - --with-datadir=/var/lib/citadel \ + --with-staticdir=/usr/share/doc/citadel-webcit/examples \ --with-rundir=/var/run/citadel \ --with-ical --with-db --with-ldap --with-zlib --with-ssl --with-libiconf --with-newt --with-included-gettext @@ -65,25 +67,13 @@ install: build # Add here commands to install the package into debian/webcit. root=$(CURDIR)/debian/webcit/ - mkdir -p $(CURDIR)/debian/webcit/var/lib/citadel/www/ - export root=$(CURDIR)/debian/webcit; $(MAKE) install DESTDIR=$(CURDIR)/debian/webcit/ - mkdir -p $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/examples - mkdir -p $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/contrib - mkdir -p $(CURDIR)/debian/citadel-webcit/usr/sbin - mkdir -p $(CURDIR)/debian/citadel-webcit/usr/lib/citadel-webcit/ - mv $(CURDIR)/debian/webcit/var/lib/citadel/www/static \ - $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/examples/ - mv $(CURDIR)/debian/webcit/var/lib/citadel/www/tiny_mce \ - $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/examples/ -# locale -> /usr/share/locale - mv $(CURDIR)/debian/webcit/var/lib/citadel/www/locale \ - $(CURDIR)/debian/citadel-webcit/usr/share/locale - cd $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/examples/; \ - md5sum `find -type f |grep -v md5sums `>md5sums; - mv $(CURDIR)/debian/webcit/var/lib/citadel/www/setup \ - $(CURDIR)/debian/citadel-webcit/usr/lib/citadel-webcit/ - mv $(CURDIR)/debian/webcit/var/lib/citadel/www/webserver \ - $(CURDIR)/debian/citadel-webcit/usr/sbin/ + export root=$(CURDIR)/debian/citadel-webcit; \ + $(MAKE) install DESTDIR=$(CURDIR)/debian/citadel-webcit + mkdir -p $(CURDIR)/debian/citadel-webcit/usr/lib/citadel-webcit ;\ + mv $(CURDIR)/debian/citadel-webcit/usr/sbin/setup \ + $(CURDIR)/debian/citadel-webcit/usr/lib/citadel-webcit/; \ + cd $(CURDIR)/debian/citadel-webcit/usr/share/doc/citadel-webcit/examples/ && \ + md5sum `find -type f |grep -v md5sums `>md5sums; \ # Build architecture-independent files here. diff --git a/webcit/src/Makefile.am b/webcit/src/Makefile.am index b7f0cf261..a77a9208b 100644 --- a/webcit/src/Makefile.am +++ b/webcit/src/Makefile.am @@ -26,7 +26,7 @@ LIBS = @LTLIBINTL@ @LIBS@ sbin_PROGRAMS = webserver setup webserver_LDADD = @LIBINTL@ - +setup_LDADD = @SETUP_LIBS@ #SUBDIRS = $(LIB_SUBDIRS) $(PROG_SUBDIRS) setup_SOURCES = setup.c tools.c