Enlightenment CVS committal
Author : dj2
Project : misc
Module : eke
Dir : misc/eke
Modified Files:
Makefile.am configure.in
Log Message:
- it should now be possibly to compile out the different interfaces.
--disable-ewl-gui and --disable-edje-gui at compile time.
- if ewl is compiled out it will default to the edje gui so you don't need
the cmd line switch anymore
===================================================================
RCS file: /cvsroot/enlightenment/misc/eke/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 27 Dec 2004 22:44:56 -0000 1.1
+++ Makefile.am 31 Dec 2004 05:17:53 -0000 1.2
@@ -1,6 +1,13 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = src data
+if BUILD_EDJE_GUI
+EDJESUBDIR = \
+ data
+endif
+
+SUBDIRS = \
+ src \
+ $(EDJESUBDIR)
MAINTAINERCLEANFILES = Makefile.in config.guess configure aclocal.m4 \
config.guess config.sub install-sh ltconfig ltmain.sh missing \
===================================================================
RCS file: /cvsroot/enlightenment/misc/eke/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- configure.in 27 Dec 2004 22:44:56 -0000 1.1
+++ configure.in 31 Dec 2004 05:17:53 -0000 1.2
@@ -31,6 +31,52 @@
AC_EXPAND_DIR(PACKAGE_DATA_DIR, "$datadir/${PACKAGE}")
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "$PACKAGE_DATA_DIR", [Shared data
directory])
+AC_MSG_CHECKING(whether to build EWL gui)
+want_ewl_gui="yes"
+AC_ARG_ENABLE(ewl-gui, [ --disable-ewl-gui disable build of the EWL gui ],
+ [
+ if [ test "$enableval" = "yes" ]; then
+ AC_MSG_RESULT(yes)
+ want_ewl_gui="yes"
+ else
+ AC_MSG_RESULT(no)
+ want_ewl_gui="no"
+ fi
+ ], [
+ AC_MSG_RESULT($want_ewl_gui)
+ ]
+)
+if test "x$want_ewl_gui" = "xyes"; then
+ AM_CONDITIONAL(BUILD_EWL_GUI, true)
+ AC_DEFINE_UNQUOTED(BUILD_EWL_GUI, 1, [Build EWL GUI])
+else
+ AM_CONDITIONAL(BUILD_EWL_GUI, false)
+ AC_DEFINE_UNQUOTED(BUILD_EWL_GUI, 0, [Disable EWL GUI])
+fi
+
+AC_MSG_CHECKING(whether to build Edje gui)
+want_edje_gui="yes"
+AC_ARG_ENABLE(edje-gui, [ --disable-edje-gui disable build of the Edje
gui ],
+ [
+ if [ test "$enableval" = "yes" ]; then
+ AC_MSG_RESULT(yes)
+ want_edje_gui="yes"
+ else
+ AC_MSG_RESULT(no)
+ want_edje_gui="no"
+ fi
+ ], [
+ AC_MSG_RESULT($want_edje_gui)
+ ]
+)
+if test "x$want_edje_gui" = "xyes"; then
+ AM_CONDITIONAL(BUILD_EDJE_GUI, true)
+ AC_DEFINE_UNQUOTED(BUILD_EDJE_GUI, 1, [Build Edje GUI])
+else
+ AM_CONDITIONAL(BUILD_EDJE_GUI, false)
+ AC_DEFINE_UNQUOTED(BUILD_EDJE_GUI, 0, [Disable Edje GUI])
+fi
+
AC_CONFIG_FILES([
Makefile
m4/Makefile
@@ -40,6 +86,14 @@
data/themes/default/Makefile
])
+if test "x$want_edje_gui" = "xno"; then
+ if test "x$want_ewl_gui" = "xno"; then
+ echo
+ echo "WARNING: No GUI being built!"
+ echo
+ fi
+fi
+
AC_OUTPUT
echo
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
