forked from enlightenment/efl
* really export symbols on Windows (EFL_EINA_BUILD not
correctly defined) * add evil in the Requires.private field of eina-0.pc.in SVN revision: 42702
This commit is contained in:
parent
568acf4705
commit
47e25ab257
|
@ -28,6 +28,8 @@ AC_SUBST(version_info)
|
||||||
|
|
||||||
### Needed information
|
### Needed information
|
||||||
|
|
||||||
|
requirement_eina=""
|
||||||
|
|
||||||
release="ver-pre-svn-04"
|
release="ver-pre-svn-04"
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
mingw32ce* | cegcc*)
|
mingw32ce* | cegcc*)
|
||||||
|
@ -192,6 +194,14 @@ AC_PROG_CC
|
||||||
# pkg-config
|
# pkg-config
|
||||||
PKG_PROG_PKG_CONFIG
|
PKG_PROG_PKG_CONFIG
|
||||||
|
|
||||||
|
# Check whether pkg-config supports Requires.private
|
||||||
|
if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
|
||||||
|
pkgconfig_requires_private="Requires.private"
|
||||||
|
else
|
||||||
|
pkgconfig_requires_private="Requires"
|
||||||
|
fi
|
||||||
|
AC_SUBST(pkgconfig_requires_private)
|
||||||
|
|
||||||
# doxygen program for documentation building
|
# doxygen program for documentation building
|
||||||
|
|
||||||
EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
||||||
|
@ -201,12 +211,16 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
||||||
|
|
||||||
# Evil library for compilation on Windows CE
|
# Evil library for compilation on Windows CE
|
||||||
|
|
||||||
|
EFL_EINA_BUILD=""
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
mingw* | cegcc*)
|
mingw* | cegcc*)
|
||||||
PKG_CHECK_MODULES([EVIL], [evil])
|
PKG_CHECK_MODULES([EVIL], [evil])
|
||||||
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
|
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
|
||||||
|
requirement_eina="evil"
|
||||||
|
EFL_EINA_BUILD="-DEFL_EINA_BUILD"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
AC_SUBST(EFL_EINA_BUILD)
|
||||||
|
|
||||||
# Check ememoa memory pool library
|
# Check ememoa memory pool library
|
||||||
|
|
||||||
|
@ -313,7 +327,6 @@ EINA_LIBS=
|
||||||
lt_enable_auto_import=""
|
lt_enable_auto_import=""
|
||||||
case "${host_os}" in
|
case "${host_os}" in
|
||||||
mingw* | cegcc*)
|
mingw* | cegcc*)
|
||||||
AC_DEFINE(EFL_EINA_BUILD, 1, [Define to mention that eina is built])
|
|
||||||
EINA_LIBS="-ldl ${EVIL_LIBS} -lm"
|
EINA_LIBS="-ldl ${EVIL_LIBS} -lm"
|
||||||
lt_enable_auto_import="-Wl,--enable-auto-import"
|
lt_enable_auto_import="-Wl,--enable-auto-import"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
||||||
|
|
||||||
Name: Eina
|
Name: Eina
|
||||||
Description: A Library that implements fast data types and miscellaneous tools
|
Description: A Library that implements fast data types and miscellaneous tools
|
||||||
Requires:
|
@pkgconfig_requires_private@: @requirement_eina@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Libs: -L${exec_prefix}/lib -leina
|
Libs: -L${exec_prefix}/lib -leina
|
||||||
Libs.private: -ldl
|
Libs.private: -ldl
|
||||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
||||||
|
|
||||||
Name: Eina
|
Name: Eina
|
||||||
Description: Eina
|
Description: Eina
|
||||||
Requires:
|
@pkgconfig_requires_private@: @requirement_eina@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Libs: -L${libdir} -leina
|
Libs: -L${libdir} -leina
|
||||||
Libs.private: -ldl
|
Libs.private: -ldl
|
||||||
|
|
|
@ -7,7 +7,8 @@ AM_CPPFLAGS = \
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||||
@EINA_CPPFLAGS@
|
@EINA_CPPFLAGS@ \
|
||||||
|
@EFL_EINA_BUILD@
|
||||||
|
|
||||||
base_sources = \
|
base_sources = \
|
||||||
eina_error.c \
|
eina_error.c \
|
||||||
|
|
|
@ -4,7 +4,8 @@ AM_CPPFLAGS = \
|
||||||
-I. \
|
-I. \
|
||||||
-I$(top_srcdir)/src/include \
|
-I$(top_srcdir)/src/include \
|
||||||
-I$(top_builddir)/src/include \
|
-I$(top_builddir)/src/include \
|
||||||
@EINA_CPPFLAGS@
|
@EINA_CPPFLAGS@ \
|
||||||
|
@EFL_EINA_BUILD@
|
||||||
|
|
||||||
if EINA_BUILD_CHAINED_POOL
|
if EINA_BUILD_CHAINED_POOL
|
||||||
if !EINA_STATIC_BUILD_CHAINED_POOL
|
if !EINA_STATIC_BUILD_CHAINED_POOL
|
||||||
|
|
|
@ -6,7 +6,8 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_builddir)/src/include \
|
-I$(top_builddir)/src/include \
|
||||||
@EINA_CPPFLAGS@ \
|
@EINA_CPPFLAGS@ \
|
||||||
@EINA_CFLAGS@ \
|
@EINA_CFLAGS@ \
|
||||||
@EMEMOA_CFLAGS@
|
@EMEMOA_CFLAGS@ \
|
||||||
|
@EFL_EINA_BUILD@
|
||||||
|
|
||||||
if EINA_BUILD_EMEMOA_FIXED
|
if EINA_BUILD_EMEMOA_FIXED
|
||||||
if !EINA_STATIC_BUILD_EMEMOA_FIXED
|
if !EINA_STATIC_BUILD_EMEMOA_FIXED
|
||||||
|
|
|
@ -6,7 +6,8 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_builddir)/src/include \
|
-I$(top_builddir)/src/include \
|
||||||
@EINA_CPPFLAGS@ \
|
@EINA_CPPFLAGS@ \
|
||||||
@EINA_CFLAGS@ \
|
@EINA_CFLAGS@ \
|
||||||
@EMEMOA_CFLAGS@
|
@EMEMOA_CFLAGS@ \
|
||||||
|
@EFL_EINA_BUILD@
|
||||||
|
|
||||||
if EINA_BUILD_EMEMOA_UNKNOWN
|
if EINA_BUILD_EMEMOA_UNKNOWN
|
||||||
if !EINA_STATIC_BUILD_EMEMOA_UNKNOWN
|
if !EINA_STATIC_BUILD_EMEMOA_UNKNOWN
|
||||||
|
|
|
@ -5,7 +5,8 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/include \
|
-I$(top_srcdir)/src/include \
|
||||||
-I$(top_builddir)/src/include \
|
-I$(top_builddir)/src/include \
|
||||||
@EINA_CPPFLAGS@ \
|
@EINA_CPPFLAGS@ \
|
||||||
@EINA_CFLAGS@
|
@EINA_CFLAGS@ \
|
||||||
|
@EFL_EINA_BUILD@
|
||||||
|
|
||||||
if EINA_BUILD_FIXED_BITMAP
|
if EINA_BUILD_FIXED_BITMAP
|
||||||
if !EINA_STATIC_BUILD_FIXED_BITMAP
|
if !EINA_STATIC_BUILD_FIXED_BITMAP
|
||||||
|
|
|
@ -5,7 +5,8 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/include \
|
-I$(top_srcdir)/src/include \
|
||||||
-I$(top_builddir)/src/include \
|
-I$(top_builddir)/src/include \
|
||||||
@EINA_CPPFLAGS@ \
|
@EINA_CPPFLAGS@ \
|
||||||
@EINA_CFLAGS@
|
@EINA_CFLAGS@ \
|
||||||
|
@EFL_EINA_BUILD@
|
||||||
|
|
||||||
if EINA_BUILD_PASS_THROUGH
|
if EINA_BUILD_PASS_THROUGH
|
||||||
if !EINA_STATIC_BUILD_PASS_THROUGH
|
if !EINA_STATIC_BUILD_PASS_THROUGH
|
||||||
|
|
Loading…
Reference in New Issue