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 /src/Makefile.am | |
| 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 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5f18cc7..6d128ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,6 +17,7 @@ INCLUDES = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DCONSOLE_KIT_PID_FILE=\""$(CONSOLE_KIT_PID_FILE)"\" \ $(WARN_CFLAGS) \ $(DEBUG_CFLAGS) \ $(DBUS_CFLAGS) \ |