Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage
Modified Files:
configure.in
Log Message:
Move menu to ETK, as it works much better in an embedded environment
Also fix a few isues with includes from the cached e code
===================================================================
RCS file: /cvs/e/misc/engage/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- configure.in 3 Sep 2006 08:24:06 -0000 1.27
+++ configure.in 3 Sep 2006 15:14:51 -0000 1.28
@@ -59,11 +59,9 @@
dnl Set PACKAGE_DATA_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${HOME}/.e/e/modules/${PACKAGE}",
"Package installed data destination")
- datadir="${HOME}/.e/e/modules/${PACKAGE}"
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${libdir}/enlightenment/modules/${PACKAGE}", "Package installed data
destination")
- datadir="${libdir}/enlightenment/modules/${PACKAGE}"
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared
Data Directory])
fi
dnl Set PACKAGE_BIN_DIR in config.h.
@@ -138,32 +136,17 @@
AC_SUBST(evas_libs)
AC_SUBST(evas_cflags)
-have_ewl="no"
-AC_PATH_GENERIC(ewl, 0.0.1, [
- AC_DEFINE(HAVE_EWL, [], [Enlightenment Widget Library Support])
- have_ewl="yes"
- AC_SUBST(ewl_libs)
- AC_SUBST(ewl_cflags) ],
- AC_MSG_ERROR(Cannot find ewl: Is ewl-config in path?))
-ewl_libs=`ewl-config --libs`
-ewl_cflags=`ewl-config --cflags`
-AC_SUBST(ewl_libs)
-AC_SUBST(ewl_cflags)
-
-have_e17="no"
-AC_PATH_GENERIC(enlightenment, 16.999, [
- AC_DEFINE(HAVE_E17, [], [Development Enlightenment WindowManager Support])
- have_e17="true"
- AC_SUBST(e_libs)
- AC_SUBST(e_cflags) ],
- )
-AM_CONDITIONAL(HAVE_E17, test x$have_e17 = xtrue)
-e_libs=`enlightenment-config --libs`
-e_cflags=`enlightenment-config --cflags`
-e_modules=`enlightenment-config --module-dir`
-AC_SUBST(e_libs)
-AC_SUBST(e_cflags)
-AC_SUBST(e_modules)
+have_etk="no"
+AC_PATH_GENERIC(etk, 0.0.1, [
+ AC_DEFINE(HAVE_ETK, [], [ETK Support])
+ have_etk="yes"
+ AC_SUBST(etk_libs)
+ AC_SUBST(etk_cflags) ],
+ AC_MSG_ERROR(Cannot find etk: Is etk-config in path?))
+etk_libs=`etk-config --libs`
+etk_cflags=`etk-config --cflags`
+AC_SUBST(etk_libs)
+AC_SUBST(etk_cflags)
dnl Set PACKAGE_SOURCE_DIR in config.h.
#packagesrcdir=`cd $srcdir && pwd`
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
