Use new macros (perl-check and afs-check). Added a new subst variable

(which for now is a dummy) NSLPATH. These are back-ports from trunk.

diff --git a/configure.in b/configure.in
index ecc39226b9f816fb70015e37ac2eed54189a5eab..d52e79028fa26c8df866b611ffdb304bc64b455a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.126.2.9 2001-12-31 20:14:18 srittau Exp $
+dnl $Id: configure.in,v 1.126.2.10 2002-02-07 23:44:42 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -18,6 +18,7 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
+NETATALK_PROG_PERL
 
 dnl *********************************************************************
 dnl FIXME! FIXME! These should be selectable properly, and should produce
@@ -116,23 +117,20 @@ AC_ARG_WITH(admin-group,
                AC_DEFINE(ADMIN_GRP, 0)
                AC_MSG_RESULT([disabling administrative group support])
         fi
- )
-
-AC_ARG_ENABLE(afs,
-       [  --enable-afs            enable AFS support],
-       if test "$enableval" = "yes"; then
-               AC_DEFINE(AFS, 1)
-               AC_MSG_RESULT([enabling AFS support])
-       fi
 )
 
+NETATALK_AFS_CHECK
+
 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="${sysconfdir}/netatalk"
+                PKGCONFDIR="$withval",
+                PKGCONFDIR="${sysconfdir}/netatalk"
 )
 
+dnl FIXME: make this an extra check
+NLSDIR="${PKGCONFDIR}/nls"
+
 AC_ARG_WITH(cracklib,
        [  --with-cracklib=DICT    enable/set location of cracklib dictionary],
        if test "x$withval" != "xno" ; then
@@ -586,6 +584,7 @@ AC_SUBST(AFPD_LIBS)
 AC_SUBST(PAPD_LIBS)
 AC_SUBST(CFLAGS)
 AC_SUBST(PKGCONFDIR)
+AC_SUBST(NLSDIR)
 AC_SUBST(OVERWRITE_CONFIG)
 
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)