SERVTEXT wasn't defined patch from Björn Fernhomberg

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index d7ad7cac5aab74008d3cf939c8c8a7125eb44f9f..3359ea38406968f3a60886245b7e0cfb7b8b4ec9 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -31,4 +31,5 @@ CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
         -D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
         -D_PATH_AFPDNLSPATH=\"$(nlsdir)/\" \
         -DAFPD_MTAB_FILE=\"$(pkgconfdir)/afpd.mtab\" \
-        -DAPPLCNAME
+        -DAPPLCNAME \
+        -DSERVERTEXT=\"$(SERVERTEXT)/\"

diff --git a/macros/config-checks.m4 b/macros/config-checks.m4
index 47d063a3ce95dfd1b07458323fc36e3f6c844d61..37bef9e8a614dcfcfd732fbb665db1b3a0137917 100644 (file)
--- a/macros/config-checks.m4
+++ b/macros/config-checks.m4
@@ -1,4 +1,4 @@
-dnl $Id: config-checks.m4,v 1.3 2002-04-29 06:23:58 morgana Exp $
+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], [
@@ -30,11 +30,10 @@ AC_DEFUN([NETATALK_CONFIG_DIRS], [
        AC_ARG_WITH(message-dir,
                [  --with-message-dir=PATH path to server message files [PKGCONF/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
                ]
        )