X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fconfig-checks.m4;h=2b4f4b7e0f3fce515ffba5ea4f49ba73bcba470f;hb=9b34bfcf9852eb6aaeeff55dca4b14cdf66b2dfd;hp=37bef9e8a614dcfcfd732fbb665db1b3a0137917;hpb=f2c23519bcd1bca46c09c95cb8bf2405d805376c;p=netatalk.git

diff --git a/macros/config-checks.m4 b/macros/config-checks.m4
index 37bef9e8..2b4f4b7e 100644
--- a/macros/config-checks.m4
+++ b/macros/config-checks.m4
@@ -1,12 +1,11 @@
-dnl $Id: config-checks.m4,v 1.4 2003-05-20 20:50:49 didg 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,24 +13,14 @@ AC_DEFUN([NETATALK_CONFIG_DIRS], [
 		]
 	)
 
-	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
-		]
-	)
-
-	SERVERTEXT="${PKGCONFDIR}/msg"
+	SERVERTEXT="${localstatedir}/netatalk/msg"
 
 	AC_ARG_WITH(message-dir,
-		[  --with-message-dir=PATH path to server message files [PKGCONF/msg]],
+		[  --with-message-dir=PATH path to server message files [[$localstatedir/netatalk/msg/]]],
 		[
 			if test x"$withval" = x"no";  then 
-				AC_MSG_WARN([*** message-dir is mandatory and cannot be disabled, using default ***])
+				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
@@ -39,6 +28,5 @@ AC_DEFUN([NETATALK_CONFIG_DIRS], [
 	)
 
 	AC_SUBST(PKGCONFDIR)
-	AC_SUBST(NLSDIR)
 	AC_SUBST(SERVERTEXT)
 ])