Enlightenment CVS committal
Author : mekius
Project : e17
Module : proto
Dir : e17/proto/empower
Modified Files:
INSTALL README configure.in
Log Message:
Add support for disabling/enabling each version of Empower. This has been long
requested, I've just been lazy :)
===================================================================
RCS file: /cvs/e/e17/proto/empower/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- INSTALL 5 Apr 2006 17:32:45 -0000 1.2
+++ INSTALL 10 Mar 2007 10:06:16 -0000 1.3
@@ -1,9 +1,15 @@
There are two versions now. The ewl version will install as 'empower_ewl'.
-The etk version will install as 'empower_etk'. At this time it checks for each
-toolkit and only builds the binaries for the toolkits you have installed.
There
-is no way to stop it building a binary if you have the library installed.
+The etk version will install as 'empower_etk'. If you only build one version,
+it will be just called empower. See below for how to control the building of
+each version.
-To install empower just do the following:
+To install empower:
./autogen.sh
make
- make install
+ make install (as root)
+
+To enable/disable ewl/etk:
+By default, this will be determined based on which toolkits are installed.
+To override pass one or more of the following to ./autogen.sh:
+ --enable-etk/--disable-etk Enable/Disable ETK
+ --enable-ewl/--disable-ewl Enable/Disable EWL
\ No newline at end of file
===================================================================
RCS file: /cvs/e/e17/proto/empower/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- README 3 Apr 2006 00:06:53 -0000 1.1
+++ README 10 Mar 2007 10:06:16 -0000 1.2
@@ -1,9 +1,9 @@
Empower - A graphical sudo tool based on the Enlightenment Foundation Libraries
-Version 0.1 - an alpha release
+Version 0.3
Usage: empower <program command>
See INSTALL for installation instructions
See COPYING and COPYING-PLAIN for license information
-Created by and Copyright 2005-2006 Nick "Mekius_" Hughart
\ No newline at end of file
+Created by and Copyright 2005-2007 Nick "Mekius_" Hughart
\ No newline at end of file
===================================================================
RCS file: /cvs/e/e17/proto/empower/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- configure.in 11 Jun 2006 10:23:48 -0000 1.4
+++ configure.in 10 Mar 2007 10:06:16 -0000 1.5
@@ -17,6 +17,8 @@
AM_WITH_DMALLOC
+AM_PROG_CC_C_O
+
dnl Add the languages which your application supports here.
ALL_LINGUAS=""
@@ -86,7 +88,7 @@
#PROG="ewl-config";
#AC_PATH_PROG(EWL_CONFIG, $PROG, "", $PATH)
-#if test -z "$EWL_CONFIG" ; then
+#if test -z "$EWL_CONFIG" ; then.
# echo $PROG " is not in your \$PATH. Please ensure it is.";
# echo "Read the manual page for your shell as to how to extend your path.";
# AC_MSG_ERROR(Cannot find $PROG)
@@ -101,23 +103,48 @@
# AC_MSG_ERROR(Cannot find $PROG)
#fi
-AC_PATH_GENERIC(ewl, 0.0.4, [have_ewl="yes"], [have_ewl="no"])
-if test x$have_ewl ; then
- ewl_cflags=`$EWL_CONFIG --cflags`
- ewl_libs=`$EWL_CONFIG --libs`
- AC_SUBST(ewl_cflags)
- AC_SUBST(ewl_libs)
-fi
-AM_CONDITIONAL(HAVE_EWL, test x$have_ewl = xyes)
-
-AC_PATH_GENERIC(etk, 0.1.0, [have_etk="yes"], [have_etk="no"])
-if test x$have_etk ; then
- etk_cflags=`$ETK_CONFIG --cflags`
- etk_libs=`$ETK_CONFIG --libs`
- AC_SUBST(etk_cflags)
- AC_SUBST(etk_libs)
+
+AC_ARG_ENABLE(ewl,
+ AC_HELP_STRING([--enable-ewl/--disable-ewl],
+ [enable/disable ewl version (default=autodetect)]),
+ [enable_ewl=$enableval ], [ enable_ewl=default])
+
+if test "x$enable_ewl" = "xdefault" || test "x$enable_ewl" = "xyes"; then
+ AC_PATH_GENERIC(ewl, 0.0.4, [enable_ewl="yes"], [enable_ewl="no"])
+ if test x$enable_ewl ; then
+ ewl_cflags=`$EWL_CONFIG --cflags`
+ ewl_libs=`$EWL_CONFIG --libs`
+ AC_SUBST(ewl_cflags)
+ AC_SUBST(ewl_libs)
+ fi
+fi
+
+AM_CONDITIONAL(ENABLE_EWL, test x$enable_ewl = xyes)
+
+AC_ARG_ENABLE(etk,
+ AC_HELP_STRING([--enable-etk/--disable-etk],
+ [enable/disable etk version (default=autodetect)]),
+ [enable_etk=$enableval], [enable_etk=default])
+
+if test "x$enable_etk" = "xdefault" || test "x$enable_etk" = "xyes"; then
+ AC_PATH_GENERIC(etk, 0.1.0, [enable_etk="yes"], [enable_etk="no"])
+ if test x$enable_etk ; then
+ etk_cflags=`$ETK_CONFIG --cflags`
+ etk_libs=`$ETK_CONFIG --libs`
+ AC_SUBST(etk_cflags)
+ AC_SUBST(etk_libs)
+ fi
+fi
+
+AM_CONDITIONAL(ENABLE_ETK, test x$enable_etk = xyes)
+
+if test "x$enable_etk" = "xyes" && test "x$enable_ewl" = "xyes"; then
+ build_separate=yes
+else
+ build_separate=no
fi
-AM_CONDITIONAL(HAVE_ETK, test x$have_etk = xyes)
+
+AM_CONDITIONAL(BUILD_SEPARATE, test x$build_separate = xyes)
#AC_DEFINE_UNQUOTED(HAVE_EWL, "${have_ewl}", [EWL])
#AC_DEFINE_UNQUOTED(HAVE_ETK, "${have_etk}", [ETK])
@@ -145,3 +172,16 @@
debian/changelog
])
+echo
+echo "Configuration:"
+echo
+echo " Install path: ${prefix}"
+echo
+echo " Toolkit Support"
+echo " ----------------"
+echo " Build ETK: $enable_etk"
+echo " Build EWL: $enable_ewl"
+echo
+echo " Building Seperate Binaries $build_separate"
+echo
+
\ No newline at end of file
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
