Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto/eina
Dir : e17/proto/eina
Modified Files:
Makefile.am configure.in
Log Message:
* compile ememoa stuff only when is it available
* move AC_C___ATTRIBUTE__ to where it belongs
* improve autotools when running 'make' just after having modified configure.in
* formatting
===================================================================
RCS file: /cvs/e/e17/proto/eina/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 30 Jul 2008 13:58:26 -0000 1.2
+++ Makefile.am 1 Aug 2008 13:03:00 -0000 1.3
@@ -1,5 +1,7 @@
## Process this file with automake to produce Makefile.in
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS = src
MAINTAINERCLEANFILES = \
===================================================================
RCS file: /cvs/e/e17/proto/eina/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.in 1 Aug 2008 12:22:31 -0000 1.6
+++ configure.in 1 Aug 2008 13:03:00 -0000 1.7
@@ -11,8 +11,6 @@
AM_INIT_AUTOMAKE(1.6 dist-bzip2)
AM_CONFIG_HEADER(config.h)
-AC_C___ATTRIBUTE__
-
AC_LIBTOOL_WIN32_DLL
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
@@ -90,11 +88,13 @@
AM_CONDITIONAL(EINA_ENABLE_TESTS, test "x${enable_tests}" = "xyes")
# Check ememoa memory pool library
+
PKG_CHECK_MODULES([EMEMOA],
[ememoa >= 0.0.26 ],
[enable_ememoa="yes"],
[enable_ememoa="no"]
)
+
AM_CONDITIONAL(EINA_ENABLE_EMEMOA, test "x${enable_ememoa}" = "xyes")
### Checks for header files
@@ -141,6 +141,7 @@
AC_C_CONST
AC_C_BIGENDIAN
AC_PROG_CC_STDC
+AC_C___ATTRIBUTE__
if test "x$enable_coverage" = "xyes"; then
CFLAGS="${DEBUG_CFLAGS}"
@@ -197,8 +198,8 @@
echo " Tests................: ${enable_tests}"
echo " Coverage.............: ${enable_coverage}"
echo
-echo "Memory pool:"
-echo " Ememoa...............: ${enable_ememoa}"
+echo " Memory pool:"
+echo " Ememoa.............: ${enable_ememoa}"
echo
echo " Installation.........: make install"
echo
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
