[PATCH][CK] autoconf fixes, separate pamlibdir variable, path expansion at make time

Michael Biebl mbiebl at gmail.com
Mon Apr 2 11:27:16 PDT 2007


The last commit 5f3b3a7aec1c2ef81dfe28d6167049ef82e81860 to ConsoleKit
had the unpleasant side effect, that you are now forced to install
libck_connector to /lib (as the pam modules are in /lib/security),
even if you want to install libck_connector to /usr/lib (as it
dependencies, like libdbus, are in /usr/lib).

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.

Please review and apply.

Michael
-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ck_autoconf_fixes.patch
Type: text/x-patch
Size: 14138 bytes
Desc: not available
Url : http://lists.freedesktop.org/archives/hal/attachments/20070402/857bd5d2/ck_autoconf_fixes-0001.bin


More information about the hal mailing list