diff options
| author | Michael Biebl <mbiebl@gmail.com> | 2007-04-02 16:16:16 -0400 |
|---|---|---|
| committer | William Jon McCann <mccann@jhu.edu> | 2007-04-02 16:16:16 -0400 |
| commit | b57d5c11612dbb896c53d65c01104bae586f6e17 (patch) | |
| tree | b7063a6133b6e339d38a372b87c00b5b1737fdde /acinclude.m4 | |
| parent | 86740ea242d0b26758e8a8c43904a0fc88a195f6 (diff) | |
autoconf fixes, separate pamlibdir variable, path expansion at make time
The attached patch does the following:
- Use a separate $pam-module-dir variable for the pam module
- Instead of defining a custom $slibdir variable, just use the
standard $libdir variable specified by autoconf
- Use the standard autoconf $docdir variable (Add AC_PREREQ(2.59) for that).
- Drop AS_AC_EXPAND macro and remove AC_DEFINE_UNQUOTED for dir variables.
+ Build the init script at make time using sed
+ Use defines in src/Makefile.am to pass the variables to gcc at make time
- Consistently use AC_HELP_STRING everywhere
- Remove/Replace deprecated macros:
+ AM_INIT_AUTOMAKE takes the package name and version number from AC_INIT
+ AM_CONFIG_HEADER -> AC_CONFIG_HEADERS
+ AC_OUTPUT -> AC_CONFIG_FILES
Patch is tested and make distcheck works.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index f23b6ca..67a9bc8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,47 +1,3 @@ -dnl as-ac-expand.m4 0.2.0 -dnl autostars m4 macro for expanding directories using configure's prefix -dnl thomas@apestaart.org - -dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) -dnl example -dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) -dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local - -AC_DEFUN([AS_AC_EXPAND], -[ - EXP_VAR=[$1] - FROM_VAR=[$2] - - dnl first expand prefix and exec_prefix if necessary - prefix_save=$prefix - exec_prefix_save=$exec_prefix - - dnl if no prefix given, then use /usr/local, the default prefix - if test "x$prefix" = "xNONE"; then - prefix="$ac_default_prefix" - fi - dnl if no exec_prefix given, then use prefix - if test "x$exec_prefix" = "xNONE"; then - exec_prefix=$prefix - fi - - full_var="$FROM_VAR" - dnl loop until it doesn't change anymore - while true; do - new_full_var="`eval echo $full_var`" - if test "x$new_full_var" = "x$full_var"; then break; fi - full_var=$new_full_var - done - - dnl clean up - full_var=$new_full_var - AC_SUBST([$1], "$full_var") - - dnl restore prefix and exec_prefix - prefix=$prefix_save - exec_prefix=$exec_prefix_save -]) - dnl EXTRA_COMPILE_WARNINGS dnl Turn on many useful compiler warnings |