From f4918db9dc26e3585054cc3841f379137bb9f8a6 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 1 Feb 2010 11:17:03 -0500 Subject: Split off libini_config into a shared library --- server/Makefile.am | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'server/Makefile.am') diff --git a/server/Makefile.am b/server/Makefile.am index 38b96088..0770a5ba 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -145,11 +145,16 @@ else -lcollection endif -INI_CFG_CFLAGS = \ - -I$(srcdir)/../common/ini -INI_CFG_LIBS = \ - -L$(builddir)/../common/ini/.libs/ \ - -lini_config +if HAVE_SYSTEM_INI_CONFIG + INI_CFG_CFLAGS = $(SYSTEM_INI_CONFIG_CFLAGS) + INI_CFG_LIBS = $(SYSTEM_INI_CONFIG_LIBS) +else + INI_CFG_CFLAGS = \ + -I$(srcdir)/../common/ini + INI_CFG_LIBS = \ + -L$(builddir)/../common/ini/ \ + -lini_config +endif if HAVE_SYSTEM_DHASH DHASH_CFLAGS = $(SYSTEM_DHASH_CFLAGS) -- cgit