From e0a428c2fcbeab45a637ad78f4d3156c60d0e766 Mon Sep 17 00:00:00 2001
From: srittau <srittau>
Date: Wed, 13 Feb 2002 16:44:02 +0000
Subject: [PATCH] New command line option: --with-nls-dir, moved pkgdir check
 into its own file.

---
 configure.in            | 14 ++------------
 macros/Makefile.am      |  1 +
 macros/config-checks.m4 | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100644 macros/config-checks.m4

diff --git a/configure.in b/configure.in
index b96eec0d..b35371b4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.154 2002-02-08 17:43:15 jmarcus Exp $
+dnl $Id: configure.in,v 1.155 2002-02-13 16:44:02 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -123,15 +123,7 @@ AC_ARG_WITH(admin-group,
 
 NETATALK_AFS_CHECK
 
-AC_ARG_WITH(pkgconfdir,
-        [  --with-pkgconfdir=DIR   package specific configuration in DIR
-                          [[SYSCONF/netatalk]]],
-                PKGCONFDIR="$withval",
-                PKGCONFDIR="${sysconfdir}/netatalk"
-)
-
-dnl FIXME: make this an extra check
-NLSDIR="${PKGCONFDIR}/nls"
+NETATALK_CONFIG_DIRS
 
 AC_ARG_WITH(logfile,
 	[  --with-logfile=PATH     path for file used by logger [/var/log/netatalk.log]
@@ -608,8 +600,6 @@ AC_SUBST(LIBS)
 AC_SUBST(AFPD_LIBS)
 AC_SUBST(PAPD_LIBS)
 AC_SUBST(CFLAGS)
-AC_SUBST(PKGCONFDIR)
-AC_SUBST(NLSDIR)
 AC_SUBST(OVERWRITE_CONFIG)
 
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
diff --git a/macros/Makefile.am b/macros/Makefile.am
index 7b6c2d18..eeee5823 100644
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
 	afs-check.m4		\
+	config-checks.m4	\
 	db3-check.m4		\
 	pam-check.m4		\
 	perl-check.m4		\
diff --git a/macros/config-checks.m4 b/macros/config-checks.m4
new file mode 100644
index 00000000..42e05ea0
--- /dev/null
+++ b/macros/config-checks.m4
@@ -0,0 +1,30 @@
+dnl $Id: config-checks.m4,v 1.1 2002-02-13 16:44:04 srittau Exp $
+dnl Autoconf macro to set the configuration directories.
+
+AC_DEFUN([NETATALK_CONFIG_DIRS], [
+	PKGCONFDIR="${sysconfdir}/netatalk"
+
+	AC_ARG_WITH(pkgconfdir,
+        	[  --with-pkgconfdir=DIR   package specific configuration in DIR
+                          [SYSCONF/netatalk]],
+               	[
+			if test "x$withval" != "x"; then
+				PKGCONFDIR="$withval"
+			fi
+		]
+	)
+
+	NLSDIR="${PKGCONFDIR}/nls"
+
+	AC_ARG_WITH(nls-dir,
+		[  --with-nls-dir=PATH     path to NLS files [PKGCONF/nls]],
+		[
+			if test "x$withval" != "x"; then
+				NLSDIR = "$withval"
+			fi
+		]
+	)
+
+	AC_SUBST(PKGCONFDIR)
+	AC_SUBST(NLSDIR)
+])
-- 
2.39.2