Mostly reverted Dan's patch after a short discussion with him, but fixed

the problem regarding --with-config-dir overwriting sysconfdir even if
the former option wasn't even given.

diff --git a/configure.in b/configure.in
index 3dbe52e2e64ebea895f5a9a88dac9640c2b9d882..fc4c602af6c8ec9c80c8bcc8f276f907ff4c0a33 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.127 2001-11-20 16:04:23 pooba53 Exp $
+dnl $Id: configure.in,v 1.128 2001-11-20 19:06:46 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -137,12 +137,6 @@ dnl --------------------------------------------------------------------------
 
 AC_DEFINE(ADMIN_GRP, 1)
 
-AC_ARG_WITH(prefix,
-        [  --prefix=DIR    architecture-independant files alternative location],
-        prefix = "$withval"
-)
-
-
 AC_ARG_WITH(admin-group,
        [  --disable-admin-group   disable admin group],
         if test "$enableval" = "no"; then
@@ -159,16 +153,16 @@ AC_ARG_ENABLE(afs,
        fi
 )
 
-AC_ARG_WITH(sysconfdir,
-       [  --sysconfdir=DIR   system specific configuration files],
-               sysconfdir="$withval",
-               sysconfdir="${ac_prefix_default}/etc"
+AC_ARG_WITH(config-dir,
+       [  --with-config-dir=DIR   obsolete - use --with-pkgconfdir],
+       [sysconfdir="$withval"]
 )
 
 AC_ARG_WITH(pkgconfdir,
-       [  --with-pkgconfdir=DIR   package specific configuration in DIR],
+       [  --with-pkgconfdir=DIR   package specific configuration in DIR
+                          [[SYSCONF/netatalk]]],
                PKGCONFDIR="$withval",
-               PKGCONFDIR="${ac_prefix_default}/netatalk"
+               PKGCONFDIR="${sysconfdir}/netatalk"
 )
 
 AC_ARG_WITH(cracklib,