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. --- libck-connector/Makefile.am | 3 +-- libck-connector/ck-connector.pc.in | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'libck-connector') diff --git a/libck-connector/Makefile.am b/libck-connector/Makefile.am index e6801fd..757c41e 100644 --- a/libck-connector/Makefile.am +++ b/libck-connector/Makefile.am @@ -5,8 +5,7 @@ INCLUDES = \ $(LIBDBUS_CFLAGS) \ $(NULL) -slibdir = $(SLIBDIR) -slib_LTLIBRARIES = \ +lib_LTLIBRARIES = \ libck-connector.la \ $(NULL) diff --git a/libck-connector/ck-connector.pc.in b/libck-connector/ck-connector.pc.in index 152ce3d..67ecce3 100644 --- a/libck-connector/ck-connector.pc.in +++ b/libck-connector/ck-connector.pc.in @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=@prefix@ -libdir=@SLIBDIR@ +libdir=@libdir@ includedir=@prefix@/include Name: ck-connector -- cgit