From b57d5c11612dbb896c53d65c01104bae586f6e17 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 2 Apr 2007 16:16:16 -0400 Subject: 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. --- pam-ck-connector/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pam-ck-connector') diff --git a/pam-ck-connector/Makefile.am b/pam-ck-connector/Makefile.am index 35a4eae..eab4864 100644 --- a/pam-ck-connector/Makefile.am +++ b/pam-ck-connector/Makefile.am @@ -7,8 +7,7 @@ INCLUDES = \ -I$(top_builddir)/libck-connector \ $(NULL) -pamlibdir = $(SLIBDIR)/security - +pamlibdir = $(PAM_MODULE_DIR) pamlib_LTLIBRARIES = \ pam_ck_connector.la \ $(NULL) -- cgit