Revert preious commit

diff --git a/configure.ac b/configure.ac
index 4d3142e083e9630262e513a54dabf8ae24490a4d..30aa8cf4d66535174757e9bef91c3fa74055efc5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,13 @@
 dnl configure.ac for netatalk
 
 dnl configure.ac for netatalk
 

-AC_INIT
-AC_CONFIG_SRCDIR([etc/afpd/main.c])
+AC_INIT(etc/afpd/main.c)

 
 NETATALK_VERSION=`cat $srcdir/VERSION`
 AC_SUBST(NETATALK_VERSION)
 
 
 NETATALK_VERSION=`cat $srcdir/VERSION`
 AC_SUBST(NETATALK_VERSION)
 

-AC_CANONICAL_TARGET
+AC_CANONICAL_SYSTEM

 AM_INIT_AUTOMAKE(netatalk, ${NETATALK_VERSION})
 AM_INIT_AUTOMAKE(netatalk, ${NETATALK_VERSION})

-AC_CONFIG_HEADERS([config.h])
+AM_CONFIG_HEADER(config.h)

 AM_MAINTAINER_MODE([enable])
 
 dnl Checks for programs.
 AM_MAINTAINER_MODE([enable])
 
 dnl Checks for programs.


@@ -18,7 +17,8 @@ AC_PROG_CC_C99
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET

-LT_INIT([dlopen])
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL

 AC_PROG_PERL
 AC_PROG_GREP
 AC_PROG_PS
 AC_PROG_PERL
 AC_PROG_GREP
 AC_PROG_PS


@@ -56,9 +56,9 @@ AC_SYS_LARGEFILE([], AC_MSG_ERROR([AFP 3.x support requires Large File Support.]
 dnl --------------------------------------------------------------------------
 dnl check if dlsym needs to add an underscore, uses libtool macros 
 dnl --------------------------------------------------------------------------
 dnl --------------------------------------------------------------------------
 dnl check if dlsym needs to add an underscore, uses libtool macros 
 dnl --------------------------------------------------------------------------

-LT_LIB_DLLOAD
+AC_LTDL_DLLIB

 AC_CHECK_FUNCS(dlopen dlsym dlclose)
 AC_CHECK_FUNCS(dlopen dlsym dlclose)

-LT_FUNC_DLSYM_USCORE
+AC_LTDL_DLSYM_USCORE

 if test x"$libltdl_cv_need_uscore" = xyes; then
     AC_DEFINE(DLSYM_PREPEND_UNDERSCORE, 1, [BSD compatibility macro])
 fi
 if test x"$libltdl_cv_need_uscore" = xyes; then
     AC_DEFINE(DLSYM_PREPEND_UNDERSCORE, 1, [BSD compatibility macro])
 fi


@@ -217,7 +217,7 @@ dnl Enable silent Automake rules if present
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl --------------------- generate files
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl --------------------- generate files

-AC_CONFIG_FILES([Makefile
+AC_OUTPUT([Makefile

        bin/Makefile
        bin/ad/Makefile
        bin/afppasswd/Makefile
        bin/Makefile
        bin/ad/Makefile
        bin/afppasswd/Makefile


@@ -271,10 +271,9 @@ AC_CONFIG_FILES([Makefile
        man/man8/Makefile
        test/Makefile
        test/afpd/Makefile
        man/man8/Makefile
        test/Makefile
        test/afpd/Makefile

-       ])
-AC_CONFIG_COMMANDS([default],[chmod a+x distrib/config/netatalk-config contrib/shell_utils/apple_*
-],[])
-AC_OUTPUT
+       ],
+       [chmod a+x distrib/config/netatalk-config contrib/shell_utils/apple_*]
+)

 
 AC_NETATALK_LIBS_SUMMARY
 AC_NETATALK_CONFIG_SUMMARY
 
 AC_NETATALK_LIBS_SUMMARY
 AC_NETATALK_CONFIG_SUMMARY