From 50020fa5bf5c3773c407e4121cc4a6437fedf642 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Wed, 3 Jan 2007 20:09:37 +0000
Subject: [PATCH] * have LOCALEDIR be customizable by configure

---
 webcit/Makefile.in  |  6 +++---
 webcit/configure.in | 17 +++++++++++++++++
 webcit/debian/rules |  1 +
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index a40a2aad7..2eac9b2b2 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -18,7 +18,7 @@ top_builddir=`pwd`
 LIB_SUBDIRS=
 PROG_SUBDIRS=@PROG_SUBDIRS@
 SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
-
+LOCALEDIR=@LOCALEDIR@
 # End of configuration section
 
 all: all-progs-recursive webserver setup
@@ -65,10 +65,10 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
 	$(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
 
 .c.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\" $<
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(LOCALEDIR)\" $<
 
 .cpp.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\"  $<
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(LOCALEDIR)\" $<
 
 Makefile: $(srcdir)/Makefile.in config.status
 	CONFIG_FILES="Makefile" CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/webcit/configure.in b/webcit/configure.in
index 2cdd1c58e..b1d917040 100644
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -27,6 +27,8 @@ AC_ARG_WITH(ssl,
 		fi
 	]
 )
+
+
 dnl Set some system-specific variables which are OK to set before compiler
 dnl checks:
 PTHREAD_DEFS=-D_REENTRANT
@@ -341,6 +343,21 @@ fi
 
 AC_SUBST(SETUP_LIBS)
 
+dnl where to make webcit search its mo's?
+if test "$prefix" = "NONE"; then
+	LOCALEDIR="$ac_default_prefix/locale/"
+else
+	LOCALEDIR="$prefix/locale/"
+fi
+AC_ARG_WITH(localedir, 
+		    [  --with-locale          directory where to find our mo's],
+			[ if test "x$withval" != "xno" ; then
+				LOCALEDIR="$withval/"
+			  fi
+			]
+)
+AC_SUBST(LOCALEDIR)
+
 AC_OUTPUT(Makefile po/Makefile )
 
 echo ------------------------------------------------------------------------
diff --git a/webcit/debian/rules b/webcit/debian/rules
index 255050b29..d46918ae4 100755
--- a/webcit/debian/rules
+++ b/webcit/debian/rules
@@ -28,6 +28,7 @@ configure-stamp:
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/etc/citadel/www/ \
+		--with-localedir=/usr/share/locale \
 		--with-sysconfdir=/etc/citadel \
 		--with-spooldir=/var/spool/citadel \
 		--with-datadir=/etc/citadel \
-- 
2.30.2