summaryrefslogtreecommitdiffstats
path: root/ini
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-05-21 09:03:01 -0400
committerSimo Sorce <ssorce@redhat.com>2009-05-26 09:10:45 -0400
commita2111416b0d8ae0a2c1b3090fe62353e2c231ea6 (patch)
tree4636cb48efc877f636b86c901191920885fc2595 /ini
parent048a614802f36d8173aec5d3fd893ec845460564 (diff)
downloadding-libs-a2111416b0d8ae0a2c1b3090fe62353e2c231ea6.tar.gz
ding-libs-a2111416b0d8ae0a2c1b3090fe62353e2c231ea6.tar.xz
ding-libs-a2111416b0d8ae0a2c1b3090fe62353e2c231ea6.zip
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.
Diffstat (limited to 'ini')
-rw-r--r--ini/Makefile.am9
-rw-r--r--ini/configure.ac2
2 files changed, 6 insertions, 5 deletions
diff --git a/ini/Makefile.am b/ini/Makefile.am
index 7278136..03d8912 100644
--- a/ini/Makefile.am
+++ b/ini/Makefile.am
@@ -7,12 +7,13 @@ ACLOCAL_AMFLAGS = -I m4
# Set up the pkg-config file
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ini_config.pc
+dist_noinst_DATA = ini_config.pc
# Build library
-lib_LTLIBRARIES = libini_config.la
-libini_config_la_SOURCES = ini_config.c
-include_HEADERS = ini_config.h
+noinst_LTLIBRARIES = libini_config.la
+libini_config_la_SOURCES = \
+ ini_config.c \
+ ini_config.h
# Build unit test
noinst_PROGRAMS = ini_config_ut
diff --git a/ini/configure.ac b/ini/configure.ac
index 63fb116..3cf4796 100644
--- a/ini/configure.ac
+++ b/ini/configure.ac
@@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR([ini_config.c])
AC_CONFIG_AUX_DIR([build])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_PROG_CC
-LT_INIT([disable-shared])
+AC_PROG_LIBTOOL
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_INSTALL