Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl
Modified Files:
configure.in
Log Message:
Make the emotion/ewl_media support an optional build item.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- configure.in 15 Jul 2004 14:19:55 -0000 1.33
+++ configure.in 15 Jul 2004 16:26:06 -0000 1.34
@@ -249,31 +249,13 @@
EMOTION_CONFIG=$withval
AC_CHECK_PROG(EMOTION_CONFIG_IN_PATH, $EMOTION_CONFIG, yes, no)
if test $EMOTION_CONFIG_IN_PATH = no; then
- echo "ERROR:"
- echo "The emotion-config development script you specified:"
- echo "$EMOTION_CONFIG"
- echo "was not found. Please check the path and make sure "
- echo "the script exists and is executable."
- AC_MSG_ERROR([Fatal Error: no emotion-config detected.])
- exit;
+ echo "No emotion-config detected."
fi
],
[
AC_CHECK_PROG(EMOTION_CONFIG_IN_PATH, $EMOTION_CONFIG, yes, no)
if test $EMOTION_CONFIG_IN_PATH = no; then
- echo "ERROR:"
- echo "The emotion-config development script was not found in your execute"
- echo "path. This may mean one of several things"
- echo "1. You may not have installed the emotion-devel (or emotion-dev)"
- echo " packages."
- echo "2. You may have emotion installed somewhere not covered by your path."
- echo ""
- echo "If this is the case make sure you have the packages installed, AND"
- echo "that the emotion-config script is in your execute path (see your"
- echo "shell's manual page on setting the \$PATH environment variable), OR"
- echo "alternatively, specify the script to use with --with-emotion-config."
- AC_MSG_ERROR([Fatal Error: no emotion-config detected.])
- exit;
+ echo "No emotion-config detected."
fi
])
@@ -304,8 +286,15 @@
AC_SUBST(emotion_cflags)
AC_SUBST(emotion_libs)
-emotion_cflags=`$EMOTION_CONFIG --cflags`
-emotion_libs=`$EMOTION_CONFIG --libs`
+if [ test "x$EMOTION_CONFIG" != "x" ]; then
+ emotion_cflags=`$EMOTION_CONFIG --cflags`
+ emotion_libs=`$EMOTION_CONFIG --libs`
+ AC_CHECK_HEADERS(Emotion.h, [
+ AM_CONDITIONAL(BUILD_EMOTION_SUPPORT, true)
+ ], [
+ AM_CONDITIONAL(BUILD_EMOTION_SUPPORT, false)
+ ], [])
+fi
requirements="evas ecore edb etox edje emotion"
AC_SUBST(requirements)
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
