X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fconfig-checks.m4;h=2b4f4b7e0f3fce515ffba5ea4f49ba73bcba470f;hb=0612081546981aae6caa7fde0f60fee10d9b688a;hp=47d063a3ce95dfd1b07458323fc36e3f6c844d61;hpb=b93e96b80cf9dc3255c123d6b6e9ae9604e6c5f4;p=netatalk.git

diff --git a/macros/config-checks.m4 b/macros/config-checks.m4
index 47d063a3..2b4f4b7e 100644
--- a/macros/config-checks.m4
+++ b/macros/config-checks.m4
@@ -1,12 +1,11 @@
-dnl $Id: config-checks.m4,v 1.3 2002-04-29 06:23:58 morgana 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,32 +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]],
-		[
-			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"; then
+			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"
-				cat >> confdefs.h <<EOF
-#define SERVERTEXT "$withval"
-EOF
 			fi
 		]
 	)
 
 	AC_SUBST(PKGCONFDIR)
-	AC_SUBST(NLSDIR)
 	AC_SUBST(SERVERTEXT)
 ])