autoconf updates from trunk.

diff --git a/configure.in b/configure.in
index b618ea472554c91afdea5a9b8d17159b3696bd26..806b44f3346d11989039edd0cf8b1c4e322fe0cf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.126.2.18 2002-02-08 17:43:57 jmarcus Exp $
+dnl $Id: configure.in,v 1.126.2.19 2002-03-12 11:19:27 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -18,7 +18,7 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
-NETATALK_PROG_PERL
+AC_PROG_PERL
 AC_PROG_GREP
 AC_PROG_PS
 
@@ -123,15 +123,7 @@ AC_ARG_WITH(admin-group,
 
 NETATALK_AFS_CHECK
 
-AC_ARG_WITH(pkgconfdir,
-        [  --with-pkgconfdir=DIR   package specific configuration in DIR
-                          [[SYSCONF/netatalk]]],
-                PKGCONFDIR="$withval",
-                PKGCONFDIR="${sysconfdir}/netatalk"
-)
-
-dnl FIXME: make this an extra check
-NLSDIR="${PKGCONFDIR}/nls"
+NETATALK_CONFIG_DIRS
 
 AC_ARG_WITH(cracklib,
        [  --with-cracklib=DICT    enable/set location of cracklib dictionary],
@@ -591,8 +583,6 @@ AC_SUBST(LIBS)
 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)

diff --git a/macros/Makefile.am b/macros/Makefile.am
index 26b2a6205ad32939039d1c047e332605afc2cb1f..1afe926fff01f4c75c6077ac3cbc6aceb6747f44 100644 (file)
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -1,9 +1,11 @@
 EXTRA_DIST = \
        afs-check.m4            \
+       config-checks.m4        \
        db3-check.m4            \
        grep-check.m4           \
        pam-check.m4            \
        perl-check.m4           \
+       ps-check.m4             \
        quota-check.m4          \
        srvloc.m4               \
        ssl-check.m4

diff --git a/macros/perl-check.m4 b/macros/perl-check.m4
index a9142cc268828639a82b7c4e4b9f302e2b19ec10..926e5a273fc7720672aef49867a4e04b6fa8c3fa 100644 (file)
--- a/macros/perl-check.m4
+++ b/macros/perl-check.m4
@@ -1,9 +1,10 @@
 dnl Autoconf macro to check for the existence of Perl
-dnl $Id: perl-check.m4,v 1.3.2.1 2002-02-07 23:41:09 srittau Exp $
+dnl $Id: perl-check.m4,v 1.3.2.2 2002-03-12 11:19:44 srittau Exp $
 
-dnl FIXME: This needs to be a proper check
-AC_DEFUN([NETATALK_PROG_PERL], [
-       PERL=/usr/bin/perl
+AC_DEFUN([AC_PROG_PERL], [
+       AC_REQUIRE([AC_EXEEXT])dnl
+       test "x$PERL" = x && AC_PATH_PROG(PERL, perl$EXEEXT, perl$EXEEXT)
+       test "x$PERL" = x && AC_MSG_ERROR([no acceptable Perl found in \$PATH])
 ])
 
 AC_SUBST(PERL)