Fixes to configure process for server messaging.

diff --git a/configure.in b/configure.in
index 1c06a17852bf08731e2a1d107ee26f5ab166a5bb..d15bc05c365732c9f1f337049dba59b04e0c10e6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.156 2002-02-13 16:48:10 srittau Exp $
+dnl $Id: configure.in,v 1.157 2002-04-29 06:23:57 morgana Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -242,19 +242,6 @@ fi
 dnl Check for quota support
 AC_CHECK_QUOTA
 
-msg_dir=""
-AC_ARG_WITH(message-dir,
-       [  --with-message-dir=PATH path to message files [[PKGCONF/msg]]],
-               msg_dir="$withval"
-               if test x"$msg_dir" = "x"; then
-                       msg_dir="${PKGCONFDIR}/msg"
-               fi
-               AC_DEFINE_UNQUOTED(SERVERTEXT, "$msg_dir",
-                       [path to message dir [[PKGCONF/msg]]])
-               SERVERTEXT="$msg_dir"
-               AC_SUBST(SERVERTEXT)
-)
-
 dnl Check for optional server location protocol support (used by MacOS X)
 NETATALK_SRVLOC
 

diff --git a/macros/config-checks.m4 b/macros/config-checks.m4
index d65cefbdb4517990119c3df898f9b43f29d8ee6f..47d063a3ce95dfd1b07458323fc36e3f6c844d61 100644 (file)
--- a/macros/config-checks.m4
+++ b/macros/config-checks.m4
@@ -1,4 +1,4 @@
-dnl $Id: config-checks.m4,v 1.2 2002-04-06 12:38:12 srittau Exp $
+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], [
@@ -25,6 +25,21 @@ AC_DEFUN([NETATALK_CONFIG_DIRS], [
                ]
        )
 
+       SERVERTEXT="${PKGCONFDIR}/msg"
+
+       AC_ARG_WITH(message-dir,
+               [  --with-message-dir=PATH path to server message files [PKGCONF/msg]],
+               [
+                       if test "x$withval" != "x"; then
+                               SERVERTEXT="$withval"
+                               cat >> confdefs.h <<EOF
+#define SERVERTEXT "$withval"
+EOF
+                       fi
+               ]
+       )
+
        AC_SUBST(PKGCONFDIR)
        AC_SUBST(NLSDIR)
+       AC_SUBST(SERVERTEXT)
 ])