autoconf: updates and cleanup

Update autoconf macros to their modern equivalents, according to what
the 'autoupdate' tool does. While we're here, remove automake references
that aren't being used, and remove the obsolete AC_PROG_LIBTOOL in favor
of AFS_LT_INIT.

Reviewed-on: https://gerrit.openafs.org/12199
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 4706854f57043c8393baa922dd1974176e110a19)

Change-Id: I9b3b8a15ac73484f60d16448abd8cce2e0334201
Reviewed-on: https://gerrit.openafs.org/13480
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Marcio Brito Barbosa <mbarbosa@sinenomine.net>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/configure-libafs.ac b/configure-libafs.ac
index b244f69d75471e2373efdf90534cbd1b1749dbd5..46807de816df0ae2103f8edba8bdcaae8f083aa6 100644 (file)
--- a/configure-libafs.ac
+++ b/configure-libafs.ac
@@ -1,11 +1,7 @@
 AC_PRERQ([2.60])
-AC_INIT([OpenAFS],
-       m4_esyscmd([build-tools/git-version .]),
-       [openafs-bugs@openafs.org], [],
-       [http://www.openafs.org/])
+AC_INIT([OpenAFS],[m4_esyscmd(build-tools/git-version .)],[openafs-bugs@openafs.org],[],[http://www.openafs.org/])
 AC_CONFIG_AUX_DIR([build-tools])
 AC_CONFIG_SRCDIR([src/libafs/Makefile.common.in])
-AM_INIT_AUTOMAKE([foreign])
 
 AC_CONFIG_HEADER([src/config/afsconfig.h])
 MACOS_VERSION=1.8.3
@@ -18,7 +14,7 @@ AC_PROG_CC
 
 OPENAFS_CONFIGURE_COMMON
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
        Makefile
        src/config/Makefile
        src/config/Makefile.config
@@ -28,3 +24,4 @@ AC_OUTPUT([
        src/libafs/Makefile.common
        src/libafs/MakefileProto
 ])
+AC_OUTPUT

diff --git a/configure.ac b/configure.ac
index 0f79cd59d4525dfc9e4b7e33646a89da8f3f7051..0f7e3f4923333c17f53bee375a1922be88c8dc0c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,8 @@
 AC_PREREQ([2.60])
-AC_INIT([OpenAFS],
-    m4_esyscmd([build-tools/git-version .]),
-    [openafs-bugs@openafs.org], [],
-    [http://www.openafs.org/])
+AC_INIT([OpenAFS],[m4_esyscmd(build-tools/git-version .)],[openafs-bugs@openafs.org],[],[http://www.openafs.org/])
 AC_CONFIG_AUX_DIR([build-tools])
 AC_CONFIG_MACRO_DIR([src/cf])
 AC_CONFIG_SRCDIR([src/config/stds.h])
-AM_INIT_AUTOMAKE([foreign])
 
 AC_CONFIG_HEADER([src/config/afsconfig.h])
 MACOS_VERSION=1.8.3
@@ -22,7 +18,6 @@ AC_USE_SYSTEM_EXTENSIONS
 AFS_LT_INIT
 
 AC_PROG_CC
-AC_PROG_LIBTOOL
 
 AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
 AC_SUBST([PATH_CPP])
@@ -138,7 +133,7 @@ AS_IF([test -f 'doc/doxygen/Doxyfile.in'],
     [DOXYFILE="doc/doxygen/Doxyfile"],
     [DOXYFILE=])
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
     Makefile
     ${MAN_MAKEFILE}
     ${ADMINGUIDE_MAKEFILE}
@@ -286,9 +281,10 @@ AC_OUTPUT([
     tests/rx/Makefile
     tests/tap/Makefile
     tests/util/Makefile
-    tests/volser/Makefile],
-[chmod a+x src/config/shlib-build
- chmod a+x src/config/shlib-install])
+    tests/volser/Makefile])
+AC_CONFIG_COMMANDS([default],[chmod a+x src/config/shlib-build
+ chmod a+x src/config/shlib-install],[])
+AC_OUTPUT
 
 # print a final summary
 OPENAFS_SUMMARY

diff --git a/src/cf/lex.m4 b/src/cf/lex.m4
index 4658815d4a8feb52c9daa5c6c7b1e0edf0d94d0f..938b1082cfb56ce4643ca4216b8ee8a8ce928281 100644 (file)
--- a/src/cf/lex.m4
+++ b/src/cf/lex.m4
@@ -1,5 +1,5 @@
 AC_DEFUN([OPENAFS_LEX],[
-AM_PROG_LEX
+AC_PROG_LEX
 dnl if we are flex, be lex-compatible
 OPENAFS_LEX_IS_FLEX([AC_SUBST([LEX], ["$LEX -l"])])
 ])