Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/embryo
Dir : e17/libs/embryo
Modified Files:
Makefile.am configure.in embryo.pc.in
Log Message:
* use @datadir@/@PACKAGE@ and not @PACKAGE_DATA_DIR@ in embryo.pc.in
* use --enable-auto-import with CeGCC
* put WIN32_CFLAGS in CFLAGS and not CPPFLAGS
* remove warning when configuring with newest (2.62) autoconf
* clean MAINTAINERCLEANFILES and EXTRA_DIST
* formatting (should be very close to how eet is formatted, now)
===================================================================
RCS file: /cvs/e/e17/libs/embryo/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 18 Feb 2008 07:22:36 -0000 1.13
+++ Makefile.am 20 Apr 2008 06:14:42 -0000 1.14
@@ -1,24 +1,38 @@
SUBDIRS = src include
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
- config.h.in config.sub configure install-sh \
- ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in build-stamp configure-stamp depcomp \
- embryo_docs.tar.gz embryo.c \
- README \
- embryo.pc \
- embryo.spec
+MAINTAINERCLEANFILES = \
+Makefile.in \
+aclocal.m4 \
+compile \
+config.guess \
+config.h.in \
+config.sub \
+configure \
+depcomp \
+install-sh \
+ltmain.sh \
+missing \
+embryo_docs.tar.gz \
+m4/libtool.m4 \
+m4/lt~obsolete.m4 \
+m4/ltoptions.m4 \
+m4/ltsugar.m4 \
+m4/ltversion.m4
-bin_SCRIPTS =
-
-EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
- autogen.sh embryo.c.in gendoc \
- Doxyfile \
- README.in README \
- embryo.pc.in \
- embryo.spec.in embryo.spec \
- doc gendoc
+EXTRA_DIST = \
+AUTHORS \
+COPYING \
+COPYING-PLAIN \
+autogen.sh \
+embryo.c.in \
+embryo.pc.in \
+embryo.spec.in \
+embryo.spec \
+README.in \
+README \
+Doxyfile \
+doc \
+gendoc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = embryo.pc
-
===================================================================
RCS file: /cvs/e/e17/libs/embryo/configure.in,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- configure.in 11 Apr 2008 05:59:41 -0000 1.66
+++ configure.in 20 Apr 2008 06:14:42 -0000 1.67
@@ -16,6 +16,7 @@
AM_PROG_CC_STDC
AC_HEADER_STDC
AC_C_CONST
+AM_PROG_CC_C_O
AC_LIBTOOL_WIN32_DLL
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
@@ -30,9 +31,10 @@
AC_SUBST(version_info)
WIN32_CFLAGS=""
-create_shared_lib=""
+lt_no_undefined=""
+lt_enable_auto_import=""
case "$host_os" in
- mingw|mingw32*|cegcc)
+ mingw*|cegcc)
PKG_CHECK_MODULES([EVIL], evil)
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
dnl needed for correct definition of EAPI
@@ -40,30 +42,32 @@
AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Defined to 1 (MinGW / CeGCC
platform)])
if test "x$host_os" = "xcegcc" ; then
WIN32_CFLAGS="-mwin32"
+ lt_enable_auto_import="-Wl,--enable-auto-import"
fi
- create_shared_lib="-no-undefined"
+ lt_no_undefined="-no-undefined"
;;
*)
AC_CHECK_FUNCS(gettimeofday)
esac
AC_SUBST(WIN32_CFLAGS)
-AC_SUBST(create_shared_lib)
+AC_SUBST(lt_no_undefined)
+AC_SUBST(lt_enable_auto_import)
dnl Checking for __attribute__ support
AC_MSG_CHECKING([for __attribute__])
-AC_CACHE_VAL(have___attribute__,
+AC_CACHE_VAL(_cv_have___attribute__,
[
AC_TRY_COMPILE([#include <stdlib.h>],
[int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
- [have___attribute__="yes"],
- [have___attribute__="no"])
+ [_cv_have___attribute__="yes"],
+ [_cv_have___attribute__="no"])
]
)
-if test "x${have___attribute__}" = "xyes" ; then
+if test "x${_cv_have___attribute__}" = "xyes" ; then
AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has
__attribute__])
fi
-AC_MSG_RESULT(${have___attribute__})
+AC_MSG_RESULT(${_cv_have___attribute__})
AC_FUNC_ALLOCA
===================================================================
RCS file: /cvs/e/e17/libs/embryo/embryo.pc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- embryo.pc.in 23 Mar 2007 21:55:16 -0000 1.4
+++ embryo.pc.in 20 Apr 2008 06:14:42 -0000 1.5
@@ -1,6 +1,6 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/@PACKAGE@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
