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

[William Jon McCann]

Hi Michael,

On 4/2/07, Michael Biebl <mbiebl at gmail.com> wrote:
> 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.

Looks nice!  I've applied this with two changes:

* fixed typo in configure.ac "bindri"
* didn't build if docs were enabled since DOCDIR isn't defined so I
added DOCDIR back.  It sounds like $(docdir) is suppose to work but it
wasn't getting defined for me.  Any ideas?

http://gitweb.freedesktop.org/?p=ConsoleKit.git;a=commit;h=b57d5c11612dbb896c53d65c01104bae586f6e17

Thanks,
Jon