Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : apps/efsd
Dir : e17/apps/efsd
Modified Files:
acconfig.h configure.in
Removed Files:
configure.ac
Log Message:
Decided to require ecore. Live with it
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/efsd/acconfig.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- acconfig.h 11 Jul 2001 20:33:28 -0000 1.4
+++ acconfig.h 10 Aug 2005 23:59:32 -0000 1.5
@@ -8,6 +8,7 @@
#undef PACKAGE_BIN_DIR
#undef PACKAGE_LIB_DIR
#undef USE_THREADS
+#undef HAVE_ECORE
#undef HAVE_STATFS
#undef HAVE_STATVFS
#undef NO_STACK_TRACE
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/efsd/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- configure.in 8 Aug 2005 12:44:47 -0000 1.26
+++ configure.in 10 Aug 2005 23:59:32 -0000 1.27
@@ -138,42 +138,17 @@
AC_PATH_PROG(PERL,perl,0)
AC_SUBST(PERL)
-ecore=""
-AC_MSG_CHECKING(whether to use eCore as main-loop)
-AC_ARG_ENABLE(ecore, AC_HELP_STRING([--enable-ecore],[use eCore as main-loop]),
- [ ac_use_ecore="$enableval" ],
- [ ac_use_ecore="no" ]
- )
-
-if test X"$ac_use_ecore" = Xno; then
-# if test X"$ac_use_ecoreipc" = Xyes; then
-# AC_MSG_RESULT([forced by inclusion of eCore-IPC])
-# ac_use_ecore="forced"
-# else
- AC_MSG_RESULT([no])
-# fi
-else
- AC_MSG_RESULT([no])
-fi
-
-if test X"$ac_use_ecore" != Xno; then
- AC_PATH_GENERIC(ecore, 1.0.0, [
- AC_CHECK_LIB(ecore,ecore_main_loop_iterate,[
- ecore_cflags=`ecore-config --cflags`
- ecore_libs=`ecore-config --libs`
- ecore=yes
- if test X"$ac_use_ecore" = Xyes; then
- loop=eCore
- AC_DEFINE(HAVE_ECORE, 1, have enlightened main loop)
- AC_MSG_NOTICE([Building with eCore mainloop. ])
- fi
- ],[
- AC_MSG_NOTICE([ecore too old! no enlightened main-loop for
you! you come back -- one year!])])],[
- AC_MSG_NOTICE([ecore-config not found. no enlightened IPC.])])
+PROG="ecore-config";
+AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH)
+if [ test -z $ECORE_CONFIG ]; then
+ echo $PROG " is not in your \$PATH. Please ensure it is.";
+ echo "Read the manual page for you shell as to how to extend your path.";
+ AC_MSG_ERROR(Cannot find $PROG)
fi
-
-AC_SUBST(ecore_libs)
+ecore_cflags=`$ECORE_CONFIG --cflags`
+ecore_libs=`$ECORE_CONFIG --libs`
AC_SUBST(ecore_cflags)
+AC_SUBST(ecore_libs)
@@ -239,6 +214,7 @@
dnl Various conditionals
AM_CONDITIONAL(BUILD_ECORE_DEPENDENT, test "$ecore" != "no")
+AC_DEFINE(HAVE_ECORE,1)
AC_OUTPUT([
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs