summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am9
1 files changed, 8 insertions, 1 deletions
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