New command line option: --with-nls-dir, moved pkgdir check into its own

file.

diff --git a/configure.in b/configure.in
index b96eec0d2a134c199ae147bd8b90930fa16a5c3f..b35371b4d0de00f357ca64d6c1d5d8ca5c96f34a 100644 (file)
--- 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 7b6c2d181a26cdfb5bf25e42b14151c108c6f225..eeee5823a9cd976f6478fdd930a176b18093d2e5 100644 (file)
--- 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 (file)
index 0000000..42e05ea
--- /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)
+])