Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit
Modified Files:
autogen.sh configure.in
Log Message:
- autofoo fixes, eventually remove pkg-config
- right click -> set as wallpaper (centered for now, will get more options)
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- autogen.sh 14 Dec 2005 11:33:28 -0000 1.1
+++ autogen.sh 15 Dec 2005 10:07:13 -0000 1.2
@@ -124,7 +124,7 @@
libtoolize --force --copy
fi
echo "Running aclocal $aclocalinclude ..."
- aclocal $aclocalinclude
+ aclocal $aclocalinclude -I m4
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
echo "Running autoheader..."
autoheader
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- configure.in 14 Dec 2005 11:33:28 -0000 1.1
+++ configure.in 15 Dec 2005 10:07:13 -0000 1.2
@@ -4,7 +4,15 @@
rm -f config.cache
AC_INIT(configure.in)
+
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
AM_INIT_AUTOMAKE(exhibit, 0.0.1)
+
+AC_PREREQ(2.52)
+
AM_CONFIG_HEADER(config.h)
AC_ISC_POSIX
@@ -101,6 +109,51 @@
EPSILON_REQUIRED_VERSION=0.3.0.004
PKG_CHECK_MODULES(EPSILON, epsilon >= $EPSILON_REQUIRED_VERSION)
+#check for E
+AC_PATH_EFL(
+ enlightenment,
+ 0.16.999.022,
+ [
+ AC_DEFINE(HAVE_E, 1, have E)
+ e="E "
+ AM_CONDITIONAL(HAVE_E, true)
+ have_e="yes"
+ e_libs=`enlightenment-config --libs`
+ e_cflags=`enlightenment-config --cflags`
+ ],
+ [
+ AC_DEFINE(HAVE_E, 0, no E)
+ AM_CONDITIONAL(HAVE_E, false)
+ AC_MSG_WARN([No E, can't build E desktop support.])
+ have_e="no"
+ e_libs=""
+ e_cflags=""
+ ]
+)
+
+#check for Engrave
+AC_PATH_EFL(
+ engrave,
+ 0.1.0,
+ [
+ AC_DEFINE(HAVE_ENGRAVE, 1, have Engrave)
+ engrave="Engrave "
+ AM_CONDITIONAL(HAVE_ENGRAVE, true)
+ have_engrave="yes"
+ engrave_libs=`engrave-config --libs`
+ engrave_cflags=`engrave-config --cflags`
+ ],
+ [
+ AC_DEFINE(HAVE_ENGRAVE, 0, no Engrave)
+ AM_CONDITIONAL(HAVE_ENGRAVE, false)
+ AC_MSG_WARN([No Engrave, can't build E desktop wallpaper support (non
edje).])
+ have_engrave="no"
+ engrave_libs=""
+ engrave_cflags=""
+ ]
+)
+
+
dnl Set ETK_PACKAGE_DATA_DIR in config.h.
etk_prefix="\"`etk-config --prefix`/share/etk\""
AC_DEFINE_UNQUOTED(ETK_PACKAGE_DATA_DIR, $etk_prefix, [Data dir for etk lib.])
@@ -118,8 +171,8 @@
epsilon_cflags=`epsilon-config --cflags`
# add your required libs / include here
-my_includes="$ecore_cflags $evas_cflags $edje_cflags $etk_cflags
$epsilon_cflags"
-my_libs="$ecore_libs $evas_libs $edje_libs $etk_libs $epsilon_libs"
+my_includes="$ecore_cflags $evas_cflags $edje_cflags $etk_cflags
$epsilon_cflags $engrave_cflags $e_cflags"
+my_libs="$ecore_libs $evas_libs $edje_libs $etk_libs $epsilon_libs
$engrave_libs $e_libs"
AC_SUBST(my_includes)
AC_SUBST(my_libs)
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
