From 419d4579bcb84a3b10d8b5048df2087a3f55544f Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 21 May 2009 09:03:01 -0400 Subject: Clean up automake build to work on older versions of libtool LT_INIT is supported only on Libtool >= 2.0, so I reverted it to using AC_PROG_LIBTOOL. Also reorganized how the common libraries were being built. Now they are treated as libtool convenience libraries instead of installable libraries (the --with-singlelib configure flag can still be used to generate a combined, installable DSO) I cleaned up the set of files being installed by automake, so the list of things we need to remove before packaging the RPM is now only the .la files associated with our own plugins. --- server/Makefile.am | 1 + server/configure.ac | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'server') diff --git a/server/Makefile.am b/server/Makefile.am index c18ec7c2d..931e31c22 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -444,3 +444,4 @@ installsssddirs:: $(DESTDIR)$(shadow_utils_path) install-exec-hook: installsssddirs + diff --git a/server/configure.ac b/server/configure.ac index f0a1e4366..def37bd7f 100644 --- a/server/configure.ac +++ b/server/configure.ac @@ -17,7 +17,8 @@ AC_CONFIG_AUX_DIR([build]) AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) AM_PROG_CC_C_O -LT_INIT([disable-static]) +AC_DISABLE_STATIC +AC_PROG_LIBTOOL AC_CONFIG_MACRO_DIR([m4]) if test "$ac_cv_prog_gcc" = yes; then -- cgit