summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-03-07 12:11:26 (GMT)
committer Jaromil <jaromil@dyne.org>2011-03-07 12:11:26 (GMT)
commit56f08fe5f38616d75be866e44323a9a6b95032bd (patch)
tree0b6e81d88b99342dda1ee29aa361645b36bbd8bf
parentbd507680e537df5a24919a3e0766c451afe34851 (diff)
exclude subdir qt if qt-gui is not enabled
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac7
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 3aaa5a5..4b2f01e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-ruby --enable-python
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = freej.pc
-SUBDIRS = lib src qt doc bindings scripts tests
+SUBDIRS = lib src doc bindings scripts tests $(EXTRA_DIRS)
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index e93160e..5d589ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -774,8 +774,8 @@ AC_ARG_ENABLE(qt-gui,
PKG_CHECK_MODULES(QTGUI,QtGui, have_qtgui=yes, have_qtgui=no)
if test x$have_qtgui = xyes; then
AC_DEFINE(WITH_QTGUI,1,[Define if to link QtGui and build])
- fi
-])
+ QTGUI_DIRS=qt
+ fi ])
dnl ==============================================================
dnl unicap lib
@@ -959,6 +959,9 @@ AC_SUBST(CFLAGS)
CXXFLAGS="$GLOBAL_CFLAGS $CXXFLAGS"
AC_SUBST(CXXFLAGS)
+EXTRA_DIRS="$QTGUI_DIRS"
+AC_SUBST([EXTRA_DIRS])
+
dnl ==============================================================
dnl freej specific flags, explanation:
dnl STATIC_CFLAGS cflags regarding static libraries from lib/