Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
Tag: SPLIT
README acconfig.h configure.in
Removed Files:
Tag: SPLIT
configure.ac
Log Message:
busy bee. some work from the weekend & recently committed... :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/README,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -3 -r1.2 -r1.2.2.1
--- README 6 Mar 2001 16:19:17 -0000 1.2
+++ README 11 Feb 2003 06:27:09 -0000 1.2.2.1
@@ -1,26 +1,26 @@
-------------------------------------------------------------------------------
- E C O R E - 0 . 0 . 1
+ E C O R E - 1 . 0 . 0
-------------------------------------------------------------------------------
Fast:
How ot build and install Ecore from this tarball?
-./configure
+./configure \
+--enable-ecore-x \
+--enable-ecore-fb \
+--enable-ecore-evas \
+--enable-ecore-job
make
su
<as root do:>
make install
from CVS:
-./autogen.sh
+./autogen.sh \
+--enable-ecore-x \
+--enable-ecore-fb \
+--enable-ecore-evas \
+--enable-ecore-job
make
su
<as root do:>
make install
-
--------------------------------------------------------------------------------
-
-What is Ecore? It is the core event abstraction layer and X abstraction
-layer that makes doing selections, Xdnd, general X stuff, and event loops,
-timeouts and idle handlers fast, optimised, and convenient. it's a separate
-librayr so anyone can make use of the work put into Ecore to make this job
-easy for applications.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/acconfig.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -3 -r1.2 -r1.2.2.1
--- acconfig.h 29 Oct 2000 07:34:16 -0000 1.2
+++ acconfig.h 11 Feb 2003 06:27:09 -0000 1.2.2.1
@@ -1,4 +1,8 @@
#undef PACKAGE_LOCALE_DIR
#undef PACKAGE_DATA_DIR
#undef PACKAGE_SOURCE_DIR
-#undef HAVE_RENDER
+#undef PACKAGE_BIN_DIR
+#undef BUILD_ECORE_EVAS
+#undef BUILD_ECORE_FB
+#undef BUILD_ECORE_JOB
+#undef BUILD_ECORE_X
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -u -3 -r1.8.2.6 -r1.8.2.7
--- configure.in 6 Feb 2003 05:13:42 -0000 1.8.2.6
+++ configure.in 11 Feb 2003 06:27:09 -0000 1.8.2.7
@@ -1,24 +1,69 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(ecore, 1.0.0-pre1)
+AC_ISC_POSIX
+AM_INIT_AUTOMAKE(ecore, 1.0.0_pre1)
AM_CONFIG_HEADER(config.h)
-AC_ISC_POSIX
+AC_C_BIGENDIAN
AC_PROG_CC
AM_PROG_CC_STDC
AC_HEADER_STDC
+AC_C_CONST
+AM_ENABLE_SHARED
AM_PROG_LIBTOOL
-AM_WITH_DMALLOC
+if test "x${exec_prefix}" = "xNONE"; then
+ if test "x${prefix}" = "xNONE"; then
+ bindir="${ac_default_prefix}/bin";
+ else
+ bindir="${prefix}/bin";
+ fi
+else
+ if test "x${prefix}" = "xNONE"; then
+ bindir="${ac_default_prefix}/bin";
+ else
+ bindir="${prefix}/bin";
+ fi
+fi
-dnl Set PACKAGE_LOCALE_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale")
+if test "x${exec_prefix}" = "xNONE"; then
+ if test "x${prefix}" = "xNONE"; then
+ libdir="${ac_default_prefix}/lib";
+ else
+ libdir="${prefix}/lib";
+ fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
+ if test "x${prefix}" = "xNONE"; then
+ libdir="${ac_default_prefix}/lib";
+ else
+ libdir="${prefix}/lib";
+ fi
fi
+
+dnl Set PACKAGE_DATA_DIR in config.h.
+if test "x${datadir}" = 'x${prefix}/share'; then
+ if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
+ else
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
+ fi
+else
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
+fi
+
+dnl Set PACKAGE_BIN_DIR in config.h.
+if test "x${bindir}" = 'xNONE'; then
+ if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin")
+ else
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin")
+ fi
+else
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}")
+fi
+
dnl Set PACKAGE_DATA_DIR in config.h.
if test "x${datadir}" = 'x${prefix}/share'; then
if test "x${prefix}" = "xNONE"; then
@@ -44,44 +89,87 @@
fi
changequote([,])dnl
-AC_PATH_XTRA
+AC_MSG_CHECKING(whether ecore_x module is to be built)
-if test "x$x_includes" = "x"; then
- x_includes="/usr/include"
-fi
+x_dir="";
+x_includes="";
+x_cflags="";
+x_libs="";
+x_ldflags="";
+
+AC_ARG_ENABLE(ecore-x,
+[ --enable-ecore-x enable the ecore_x module], [
+ AC_MSG_RESULT(yes)
+ AM_CONDITIONAL(BUILD_ECORE_X, test "$enableval" = "yes")
+ AC_DEFINE(BUILD_ECORE_X)
+ x_dir="/usr/X11R6";
+ x_includes="";
+ x_cflags="-I"$x_dir"/include"
+ x_libs="-L"$x_dir"/lib -lX11 -lXext"
+ x_ldflags="";
+], [
+ AC_MSG_RESULT(no)
+ AM_CONDITIONAL(BUILD_ECORE_X, false)
+]
+)
-x_cflags="$X_CFLAGS"
-x_ldflags="$X_LDFLAGS"
-x_libs="$X_LIBS $X_EXTRA_LIBS"
-
-AC_CHECK_LIB(X11, XOpenDisplay, x_libs="$x_libs",
- AC_MSG_ERROR([ERROR: libX11 not found.]); exit,
- $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS)
-AC_CHECK_LIB(Xext, XShmAttach, x_libs="-lXext $x_libs",
- AC_CHECK_LIB(XextSam, XShmAttach,
- x_libs="-lXextSam -lXext $x_libs",
- AC_MSG_ERROR([ERROR: XShm not found.]); exit,
- $x_libs),
- $x_libs)
-AC_CHECK_LIB(Xext, XShapeCombineMask, x_libs="-lXext $x_libs",
- AC_MSG_ERROR([ERROR: XShape not found.]); exit,
- $x_libs)
-
AC_SUBST(x_cflags)
AC_SUBST(x_includes)
AC_SUBST(x_ldflags)
AC_SUBST(x_libs)
-PROG="evas-config";
-AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)
-if [ test -z $EVAS_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.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
-fi
-evas_cflags=`$EVAS_CONFIG --cflags`
-evas_libs=`$EVAS_CONFIG --libs`
+AC_MSG_CHECKING(whether ecore_job module is to be built)
+
+AC_ARG_ENABLE(ecore-job,
+[ --enable-ecore-job enable the ecore_job module], [
+ AC_MSG_RESULT(yes)
+ AM_CONDITIONAL(BUILD_ECORE_JOB, test "$enableval" = "yes")
+ AC_DEFINE(BUILD_ECORE_JOB)
+], [
+ AC_MSG_RESULT(no)
+ AM_CONDITIONAL(BUILD_ECORE_JOB, false)
+]
+)
+
+AC_MSG_CHECKING(whether ecore_fb module is to be built)
+
+AC_ARG_ENABLE(ecore-fb,
+[ --enable-ecore-fb enable the ecore_fb module], [
+ AC_MSG_RESULT(yes)
+ AM_CONDITIONAL(BUILD_ECORE_FB, test "$enableval" = "yes")
+ AC_DEFINE(BUILD_ECORE_FB)
+], [
+ AC_MSG_RESULT(no)
+ AM_CONDITIONAL(BUILD_ECORE_FB, false)
+]
+)
+
+evas_cflags="";
+evas_libs="";
+
+AC_MSG_CHECKING(whether ecore_evas module is to be built)
+
+AC_ARG_ENABLE(ecore-evas,
+[ --enable-ecore-evas enable the ecore_evas module], [
+ AC_MSG_RESULT(yes)
+ AM_CONDITIONAL(BUILD_ECORE_EVAS, test "$enableval" = "yes")
+ AC_DEFINE(BUILD_ECORE_EVAS)
+ PROG="evas-config";
+ AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)
+ if [ test -z $EVAS_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.";
+ echo "FATAL ERROR. ABORT.";
+ exit -1;
+ fi
+ evas_cflags=`$EVAS_CONFIG --cflags`
+ evas_libs=`$EVAS_CONFIG --libs`
+], [
+ AC_MSG_RESULT(no)
+ AM_CONDITIONAL(BUILD_ECORE_X, false)
+]
+)
+
AC_SUBST(evas_cflags)
AC_SUBST(evas_libs)
@@ -94,6 +182,7 @@
src/lib/ecore/Makefile
src/lib/ecore_job/Makefile
src/lib/ecore_x/Makefile
+src/lib/ecore_fb/Makefile
src/lib/ecore_evas/Makefile
debian/Makefile
], [
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
