From a048ace79e0e1da2bc8c8697b0bf9b69a7ac62fc Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed, 31 Mar 2010 14:50:48 -0700
Subject: Optionally use an external popt library

The one imported into pkg-config has seen very little maintenance, so
let's give users the option to use the upstream version. The default is
to use the included sources, but it can search for the system library
using --with-installed-popt.
---
 Makefile.am | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 7681d2f..17a85c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,9 +6,16 @@ GLIB_SUBDIR = glib-1.2.10
 included_glib_includes = -I./glib-1.2.10
 pkg_config_LDADD=glib-1.2.10/libglib.la
 endif
+
+if USE_INSTALLED_POPT
+pkg_config_LDADD += $(POPT_LIBS)
+else
 pkg_config_LDADD += popt/libpopt.la
 popt_includes = -I./popt
-SUBDIRS = $(GLIB_SUBDIR) popt check
+POPT_SUBDIR = popt
+endif
+
+SUBDIRS = $(GLIB_SUBDIR) $(POPT_SUBDIR) check
 
 m4dir = $(datadir)/aclocal
 m4_DATA = pkg.m4
-- 
cgit v1.2.1