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

[William Jon McCann]

On 4/2/07, Michael Biebl <mbiebl at gmail.com> wrote:
> 2007/4/2, William Jon McCann <mccann at jhu.edu>:
> > 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:
>
> Thanks.
>
> >
> > * fixed typo in configure.ac "bindri"
>
> Good catch.
>
> > * 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?
>
> Ah, I missed that one:
>
> diff --git a/doc/Makefile.am b/doc/Makefile.am
> index c401d96..43802fe 100644
> --- a/doc/Makefile.am
> +++ b/doc/Makefile.am
> @@ -12,7 +12,7 @@ SPEC_XML_FILES =                      \
>
>  if DOCBOOK_DOCS_ENABLED
>
> -htmldocdir = $(DOCDIR)/spec
> +htmldocdir = $(docdir)/spec
>  htmldoc_DATA = ConsoleKit.html
>
>  ConsoleKit.html : $(SPEC_XML_FILES)

But as I said, for some reason this doesn't work for me since $docdir
isn't set... any idea why?

Jon