* 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 SVN revision: 35293
This commit is contained in:
parent
2f71e6a3d4
commit
a6b77baa4e
|
@ -1,5 +1,7 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
SUBDIRS = src
|
SUBDIRS = src
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
|
|
|
@ -11,8 +11,6 @@ AC_ISC_POSIX
|
||||||
AM_INIT_AUTOMAKE(1.6 dist-bzip2)
|
AM_INIT_AUTOMAKE(1.6 dist-bzip2)
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
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
|
||||||
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
|
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
|
||||||
|
@ -90,11 +88,13 @@ fi
|
||||||
AM_CONDITIONAL(EINA_ENABLE_TESTS, test "x${enable_tests}" = "xyes")
|
AM_CONDITIONAL(EINA_ENABLE_TESTS, test "x${enable_tests}" = "xyes")
|
||||||
|
|
||||||
# Check ememoa memory pool library
|
# Check ememoa memory pool library
|
||||||
|
|
||||||
PKG_CHECK_MODULES([EMEMOA],
|
PKG_CHECK_MODULES([EMEMOA],
|
||||||
[ememoa >= 0.0.26 ],
|
[ememoa >= 0.0.26 ],
|
||||||
[enable_ememoa="yes"],
|
[enable_ememoa="yes"],
|
||||||
[enable_ememoa="no"]
|
[enable_ememoa="no"]
|
||||||
)
|
)
|
||||||
|
|
||||||
AM_CONDITIONAL(EINA_ENABLE_EMEMOA, test "x${enable_ememoa}" = "xyes")
|
AM_CONDITIONAL(EINA_ENABLE_EMEMOA, test "x${enable_ememoa}" = "xyes")
|
||||||
|
|
||||||
### Checks for header files
|
### Checks for header files
|
||||||
|
@ -141,6 +141,7 @@ AM_CONDITIONAL(EINA_ENABLE_COVERAGE, test "x${enable_coverage}" = "xyes")
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
AC_C_BIGENDIAN
|
AC_C_BIGENDIAN
|
||||||
AC_PROG_CC_STDC
|
AC_PROG_CC_STDC
|
||||||
|
AC_C___ATTRIBUTE__
|
||||||
|
|
||||||
if test "x$enable_coverage" = "xyes"; then
|
if test "x$enable_coverage" = "xyes"; then
|
||||||
CFLAGS="${DEBUG_CFLAGS}"
|
CFLAGS="${DEBUG_CFLAGS}"
|
||||||
|
@ -197,8 +198,8 @@ echo
|
||||||
echo " Tests................: ${enable_tests}"
|
echo " Tests................: ${enable_tests}"
|
||||||
echo " Coverage.............: ${enable_coverage}"
|
echo " Coverage.............: ${enable_coverage}"
|
||||||
echo
|
echo
|
||||||
echo "Memory pool:"
|
echo " Memory pool:"
|
||||||
echo " Ememoa...............: ${enable_ememoa}"
|
echo " Ememoa.............: ${enable_ememoa}"
|
||||||
echo
|
echo
|
||||||
echo " Installation.........: make install"
|
echo " Installation.........: make install"
|
||||||
echo
|
echo
|
||||||
|
|
|
@ -7,6 +7,8 @@ AM_CPPFLAGS = \
|
||||||
@COVERAGE_CFLAGS@ \
|
@COVERAGE_CFLAGS@ \
|
||||||
@EMEMOA_CFLAGS@
|
@EMEMOA_CFLAGS@
|
||||||
|
|
||||||
|
if EINA_ENABLE_EMEMOA
|
||||||
|
|
||||||
controllerdir = $(libdir)/eina/chained_pool/
|
controllerdir = $(libdir)/eina/chained_pool/
|
||||||
controller_LTLIBRARIES = eina_ememoa_fixed.la
|
controller_LTLIBRARIES = eina_ememoa_fixed.la
|
||||||
|
|
||||||
|
@ -16,3 +18,5 @@ eina_ememoa_fixed.c
|
||||||
eina_ememoa_fixed_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EMEMOA_LIBS@ @COVERAGE_LIBS@
|
eina_ememoa_fixed_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EMEMOA_LIBS@ @COVERAGE_LIBS@
|
||||||
eina_ememoa_fixed_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
|
eina_ememoa_fixed_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
|
||||||
eina_ememoa_fixed_la_DEPENDENCIES = $(top_builddir)/src/lib/libeina.la
|
eina_ememoa_fixed_la_DEPENDENCIES = $(top_builddir)/src/lib/libeina.la
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
Loading…
Reference in New Issue