forked from enlightenment/efl
* autotools cleanup
* fix compilation with mingw32ce SVN revision: 36913
This commit is contained in:
parent
3806efd337
commit
e835bbcf6c
|
@ -5,7 +5,7 @@ rm -f aclocal.m4 ltmain.sh
|
||||||
|
|
||||||
touch README
|
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 autoheader..." ; autoheader || exit 1
|
||||||
echo "Running autoconf..." ; autoconf || exit 1
|
echo "Running autoconf..." ; autoconf || exit 1
|
||||||
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
|
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# get rid of that stupid cache mechanism
|
# get rid of that stupid cache mechanism
|
||||||
rm -f config.cache
|
rm -f config.cache
|
||||||
|
|
||||||
AC_INIT(embryo, 0.9.9.050, enlightenment-devel@lists.sourceforge.net)
|
AC_INIT([embryo], [0.9.9.050], [enlightenment-devel@lists.sourceforge.net])
|
||||||
AC_PREREQ(2.52)
|
AC_PREREQ([2.52])
|
||||||
AC_CONFIG_SRCDIR(configure.ac)
|
AC_CONFIG_SRCDIR([configure.ac])
|
||||||
AC_CANONICAL_BUILD
|
AC_CANONICAL_BUILD
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
AC_ISC_POSIX
|
AC_ISC_POSIX
|
||||||
|
@ -17,6 +17,7 @@ AM_PROG_CC_STDC
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
AM_PROG_CC_C_O
|
AM_PROG_CC_C_O
|
||||||
|
AC_C___ATTRIBUTE__
|
||||||
|
|
||||||
AC_LIBTOOL_WIN32_DLL
|
AC_LIBTOOL_WIN32_DLL
|
||||||
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
|
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
|
||||||
|
@ -33,7 +34,6 @@ AC_SUBST(version_info)
|
||||||
PKG_CHECK_MODULES([EINA], [eina-0])
|
PKG_CHECK_MODULES([EINA], [eina-0])
|
||||||
|
|
||||||
WIN32_CFLAGS=""
|
WIN32_CFLAGS=""
|
||||||
lt_no_undefined=""
|
|
||||||
lt_enable_auto_import=""
|
lt_enable_auto_import=""
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
mingw*|cegcc)
|
mingw*|cegcc)
|
||||||
|
@ -46,51 +46,30 @@ case "$host_os" in
|
||||||
WIN32_CFLAGS="-mwin32"
|
WIN32_CFLAGS="-mwin32"
|
||||||
lt_enable_auto_import="-Wl,--enable-auto-import"
|
lt_enable_auto_import="-Wl,--enable-auto-import"
|
||||||
fi
|
fi
|
||||||
lt_no_undefined="-no-undefined"
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_CHECK_FUNCS(gettimeofday)
|
AC_CHECK_FUNCS(gettimeofday)
|
||||||
esac
|
esac
|
||||||
AC_SUBST(WIN32_CFLAGS)
|
AC_SUBST(WIN32_CFLAGS)
|
||||||
AC_SUBST(lt_no_undefined)
|
|
||||||
AC_SUBST(lt_enable_auto_import)
|
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 <stdlib.h>],
|
|
||||||
[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_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
|
if test "x$res" = "xno"; then
|
||||||
AC_CHECK_LIB(fnmatch, fnmatch, res=yes fnmatch_libs="-lfnmatch", res=no)
|
AC_SEARCH_LIBS([fnmatch],
|
||||||
dnl Test for compilation with MinGW.
|
[fnmatch iberty evil],
|
||||||
dnl fnmatch function is in the libiberty library
|
[res="yes"],
|
||||||
if test "x$res" = "xno"; then
|
[res="no"])
|
||||||
AC_CHECK_LIB(iberty, fnmatch, res=yes fnmatch_libs="-liberty", res=no)
|
if test "x$res" = "xno"; then
|
||||||
fi
|
AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor libfnmatch, nor libiberty, nor libevil])
|
||||||
if test "x$res" = "xno"; then
|
|
||||||
AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor libfnmatch, nor libiberty])
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(fnmatch_libs)
|
|
||||||
|
|
||||||
embryoincludedir='${datadir}/include'
|
embryoincludedir='${datadir}/include'
|
||||||
AC_SUBST(embryoincludedir)
|
AC_SUBST(embryoincludedir)
|
||||||
|
|
||||||
|
|
|
@ -32,9 +32,8 @@ embryo_cc_prefix.c \
|
||||||
embryo_cc_prefix.h
|
embryo_cc_prefix.h
|
||||||
|
|
||||||
embryo_cc_CFLAGS = @WIN32_CFLAGS@
|
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_LDFLAGS = @lt_enable_auto_import@
|
||||||
embryo_cc_DEPENDENCIES = $(top_builddir)/src/lib/libembryo.la
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
embryo_cc_sc5.scp \
|
embryo_cc_sc5.scp \
|
||||||
|
|
|
@ -26,8 +26,7 @@ embryo_str.c \
|
||||||
embryo_time.c
|
embryo_time.c
|
||||||
|
|
||||||
libembryo_la_CFLAGS = @WIN32_CFLAGS@
|
libembryo_la_CFLAGS = @WIN32_CFLAGS@
|
||||||
libembryo_la_LIBADD = -lm @fnmatch_libs@ @EINA_LIBS@
|
libembryo_la_LIBADD = -lm
|
||||||
libembryo_la_DEPENDENCIES = $(top_builddir)/config.h
|
libembryo_la_LDFLAGS = -no-undefined@lt_enable_auto_import@ -version-info @version_info@
|
||||||
libembryo_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
|
|
||||||
|
|
||||||
EXTRA_DIST = embryo_private.h
|
EXTRA_DIST = embryo_private.h
|
||||||
|
|
Loading…
Reference in New Issue