Add missing -R in BerkeleyDB macro

[netatalk.git] / macros / config-checks.m4

diff --git a/macros/config-checks.m4 b/macros/config-checks.m4
index d65cefbdb4517990119c3df898f9b43f29d8ee6f..2b4f4b7e0f3fce515ffba5ea4f49ba73bcba470f 100644 (file)
--- a/macros/config-checks.m4
+++ b/macros/config-checks.m4
@@ -1,12 +1,11 @@
-dnl $Id: config-checks.m4,v 1.2 2002-04-06 12:38:12 srittau Exp $
 dnl Autoconf macro to set the configuration directories.
 
-AC_DEFUN([NETATALK_CONFIG_DIRS], [
-       PKGCONFDIR="${sysconfdir}/netatalk"
+AC_DEFUN([AC_NETATALK_CONFIG_DIRS], [
+       PKGCONFDIR="${sysconfdir}"
 
        AC_ARG_WITH(pkgconfdir,
                [  --with-pkgconfdir=DIR   package specific configuration in DIR
-                          [SYSCONF/netatalk]],
+                          [[$sysconfdir]]],
                        [
                        if test "x$withval" != "x"; then
                                PKGCONFDIR="$withval"
@@ -14,17 +13,20 @@ AC_DEFUN([NETATALK_CONFIG_DIRS], [
                ]
        )
 
-       NLSDIR="${PKGCONFDIR}/nls"
 
-       AC_ARG_WITH(nls-dir,
-               [  --with-nls-dir=PATH     path to NLS files [PKGCONF/nls]],
+       SERVERTEXT="${localstatedir}/netatalk/msg"
+
+       AC_ARG_WITH(message-dir,
+               [  --with-message-dir=PATH path to server message files [[$localstatedir/netatalk/msg/]]],
                [
-                       if test "x$withval" != "x"; then
-                               NLSDIR="$withval"
+                       if test x"$withval" = x"no";  then 
+                               AC_MSG_WARN([message-dir is mandatory and cannot be disabled, using default])
+                       elif test "x$withval" != "x" && test x"$withval" != x"yes"; then
+                               SERVERTEXT="$withval"
                        fi
                ]
        )
 
        AC_SUBST(PKGCONFDIR)
-       AC_SUBST(NLSDIR)
+       AC_SUBST(SERVERTEXT)
 ])