From e835bbcf6c72660d595a2fbb9da392359274f342 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Tue, 21 Oct 2008 08:32:23 +0000 Subject: [PATCH] * autotools cleanup * fix compilation with mingw32ce SVN revision: 36913 --- legacy/embryo/autogen.sh | 2 +- legacy/embryo/configure.ac | 49 +++++++++---------------------- legacy/embryo/src/bin/Makefile.am | 3 +- legacy/embryo/src/lib/Makefile.am | 5 ++-- 4 files changed, 18 insertions(+), 41 deletions(-) diff --git a/legacy/embryo/autogen.sh b/legacy/embryo/autogen.sh index 0846992b2a..75501bcbba 100755 --- a/legacy/embryo/autogen.sh +++ b/legacy/embryo/autogen.sh @@ -5,7 +5,7 @@ rm -f aclocal.m4 ltmain.sh touch README -echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1 +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4|| exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 diff --git a/legacy/embryo/configure.ac b/legacy/embryo/configure.ac index f83040ea15..8fb1f5fdeb 100644 --- a/legacy/embryo/configure.ac +++ b/legacy/embryo/configure.ac @@ -1,9 +1,9 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT(embryo, 0.9.9.050, enlightenment-devel@lists.sourceforge.net) -AC_PREREQ(2.52) -AC_CONFIG_SRCDIR(configure.ac) +AC_INIT([embryo], [0.9.9.050], [enlightenment-devel@lists.sourceforge.net]) +AC_PREREQ([2.52]) +AC_CONFIG_SRCDIR([configure.ac]) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX @@ -17,6 +17,7 @@ AM_PROG_CC_STDC AC_HEADER_STDC AC_C_CONST AM_PROG_CC_C_O +AC_C___ATTRIBUTE__ AC_LIBTOOL_WIN32_DLL define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl @@ -33,7 +34,6 @@ AC_SUBST(version_info) PKG_CHECK_MODULES([EINA], [eina-0]) WIN32_CFLAGS="" -lt_no_undefined="" lt_enable_auto_import="" case "$host_os" in mingw*|cegcc) @@ -46,51 +46,30 @@ case "$host_os" in WIN32_CFLAGS="-mwin32" lt_enable_auto_import="-Wl,--enable-auto-import" fi - lt_no_undefined="-no-undefined" ;; *) AC_CHECK_FUNCS(gettimeofday) esac AC_SUBST(WIN32_CFLAGS) -AC_SUBST(lt_no_undefined) AC_SUBST(lt_enable_auto_import) -dnl Checking for __attribute__ support -AC_MSG_CHECKING([for __attribute__]) -AC_CACHE_VAL(_cv_have___attribute__, - [ - AC_TRY_COMPILE([#include ], - [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], - [_cv_have___attribute__="yes"], - [_cv_have___attribute__="no"]) - ] -) - -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(${_cv_have___attribute__}) - AC_FUNC_ALLOCA -AC_CHECK_HEADERS(fnmatch.h,, AC_MSG_ERROR([Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file])) +AC_CHECK_HEADER([fnmatch.h], + [dummy="yes"], + [AC_MSG_ERROR([Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file. MinGW users: see the INSTALL file])]) -fnmatch_libs="" -AC_CHECK_FUNCS(fnmatch, res=yes, res=no) +AC_CHECK_FUNCS([fnmatch], [res="yes"], [res="no"]) if test "x$res" = "xno"; then - AC_CHECK_LIB(fnmatch, fnmatch, res=yes fnmatch_libs="-lfnmatch", res=no) -dnl Test for compilation with MinGW. -dnl fnmatch function is in the libiberty library - if test "x$res" = "xno"; then - AC_CHECK_LIB(iberty, fnmatch, res=yes fnmatch_libs="-liberty", res=no) - fi - if test "x$res" = "xno"; then - AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor libfnmatch, nor libiberty]) + AC_SEARCH_LIBS([fnmatch], + [fnmatch iberty evil], + [res="yes"], + [res="no"]) + if test "x$res" = "xno"; then + AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor libfnmatch, nor libiberty, nor libevil]) fi fi -AC_SUBST(fnmatch_libs) - embryoincludedir='${datadir}/include' AC_SUBST(embryoincludedir) diff --git a/legacy/embryo/src/bin/Makefile.am b/legacy/embryo/src/bin/Makefile.am index d7bf54d913..bcfd8bd908 100644 --- a/legacy/embryo/src/bin/Makefile.am +++ b/legacy/embryo/src/bin/Makefile.am @@ -32,9 +32,8 @@ embryo_cc_prefix.c \ embryo_cc_prefix.h embryo_cc_CFLAGS = @WIN32_CFLAGS@ -embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ @EINA_CFLAGS@ -lm +embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ -lm embryo_cc_LDFLAGS = @lt_enable_auto_import@ -embryo_cc_DEPENDENCIES = $(top_builddir)/src/lib/libembryo.la EXTRA_DIST = \ embryo_cc_sc5.scp \ diff --git a/legacy/embryo/src/lib/Makefile.am b/legacy/embryo/src/lib/Makefile.am index 87b1c75a67..f982353999 100644 --- a/legacy/embryo/src/lib/Makefile.am +++ b/legacy/embryo/src/lib/Makefile.am @@ -26,8 +26,7 @@ embryo_str.c \ embryo_time.c libembryo_la_CFLAGS = @WIN32_CFLAGS@ -libembryo_la_LIBADD = -lm @fnmatch_libs@ @EINA_LIBS@ -libembryo_la_DEPENDENCIES = $(top_builddir)/config.h -libembryo_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@ +libembryo_la_LIBADD = -lm +libembryo_la_LDFLAGS = -no-undefined@lt_enable_auto_import@ -version-info @version_info@ EXTRA_DIST = embryo_private.h