1*4882a593SmuzhiyunFrom dbb578450974db5decc24560da4aeaed838849a1 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Samuel Martin <s.martin49@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 2 Jan 2014 14:03:07 +0100 4*4882a593SmuzhiyunSubject: [PATCH 2/2] configure: make wmgui build optional 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSo, make gtk-2 and glib2 dependencies optional (only needed by wmgui) 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSigned-off-by: Samuel Martin <s.martin49@gmail.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun Makefile.in | 2 +- 11*4882a593Smuzhiyun configure.ac | 17 +++++++++++++---- 12*4882a593Smuzhiyun 2 files changed, 14 insertions(+), 5 deletions(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/Makefile.in b/Makefile.in 15*4882a593Smuzhiyunindex 6d3ac98..3d2fb45 100644 16*4882a593Smuzhiyun--- a/Makefile.in 17*4882a593Smuzhiyun+++ b/Makefile.in 18*4882a593Smuzhiyun@@ -3,7 +3,7 @@ 19*4882a593Smuzhiyun include @top_builddir@/defs.mak 20*4882a593Smuzhiyun 21*4882a593Smuzhiyun LIB_DIRS = libcwiid 22*4882a593Smuzhiyun-BIN_DIRS = wmgui wminput lswm 23*4882a593Smuzhiyun+BIN_DIRS = @WMGUI@ wminput lswm 24*4882a593Smuzhiyun DOC_DIRS = man doc 25*4882a593Smuzhiyun ifdef PYTHON 26*4882a593Smuzhiyun BIND_DIRS = python 27*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 28*4882a593Smuzhiyunindex 82ca3e1..d146cb6 100644 29*4882a593Smuzhiyun--- a/configure.ac 30*4882a593Smuzhiyun+++ b/configure.ac 31*4882a593Smuzhiyun@@ -15,6 +15,11 @@ if test "$YACC" != "bison -y"; then 32*4882a593Smuzhiyun AC_MSG_ERROR([bison not found]) 33*4882a593Smuzhiyun fi 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun+AC_ARG_ENABLE( 36*4882a593Smuzhiyun+ [wmgui], 37*4882a593Smuzhiyun+ [AS_HELP_STRING([--disable-wmgui],[Do not build wmgui binary (also drop the gtk-2/glib2 dependency)])], 38*4882a593Smuzhiyun+ [ENABLE_WMGUI="$enableval"],[ENABLE_WMGUI=yes]) 39*4882a593Smuzhiyun+ 40*4882a593Smuzhiyun AC_ARG_WITH( 41*4882a593Smuzhiyun [python], 42*4882a593Smuzhiyun [AS_HELP_STRING([--without-python],[compile without python support])], 43*4882a593Smuzhiyun@@ -98,10 +103,14 @@ else 44*4882a593Smuzhiyun fi 45*4882a593Smuzhiyun AC_SUBST(LDCONFIG) 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun-pkg_modules="gtk+-2.0 >= 2.0.0 gthread-2.0" 48*4882a593Smuzhiyun-PKG_CHECK_MODULES([GTK], [$pkg_modules]) 49*4882a593Smuzhiyun-AC_SUBST(GTK_CFLAGS) 50*4882a593Smuzhiyun-AC_SUBST(GTK_LIBS) 51*4882a593Smuzhiyun+AS_IF( 52*4882a593Smuzhiyun+ [test "x$ENABLE_WMGUI" = xyes], 53*4882a593Smuzhiyun+ [pkg_modules="gtk+-2.0 >= 2.0.0 gthread-2.0" ; 54*4882a593Smuzhiyun+ PKG_CHECK_MODULES([GTK], [$pkg_modules]) 55*4882a593Smuzhiyun+ AC_SUBST(GTK_CFLAGS) 56*4882a593Smuzhiyun+ AC_SUBST(GTK_LIBS) 57*4882a593Smuzhiyun+ AC_SUBST(WMGUI, wmgui)] 58*4882a593Smuzhiyun+) 59*4882a593Smuzhiyun 60*4882a593Smuzhiyun AC_OUTPUT( 61*4882a593Smuzhiyun [Makefile] 62*4882a593Smuzhiyun-- 63*4882a593Smuzhiyun1.8.5.2 64*4882a593Smuzhiyun 65