summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-30 21:52:34 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-30 21:52:34 +0000
commitcd3d6653af9ae6af278e5553761202f196dcee78 (patch)
treefc6a12787d97a78bb410f7978a7eb7d31a32d38a /configure.ac
parent8bbef8fe2805429a99de29c264c37f177b3132bc (diff)
efl: move -lm to configure.ac variables.
EFL_ADD_LIBS() will add to requirements_libs_NAME and that will end into NAME_LIBS. SVN revision: 81910
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac26
1 files changed, 20 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 2b1a3d5..b666ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,7 +442,7 @@ esac
442EFL_ATTRIBUTE_VECTOR 442EFL_ATTRIBUTE_VECTOR
443EFL_ATTRIBUTE_ALWAYS_INLINE 443EFL_ATTRIBUTE_ALWAYS_INLINE
444 444
445EFL_LIBS= 445EFL_LIBS=""
446AC_SUBST([EFL_LIBS]) 446AC_SUBST([EFL_LIBS])
447 447
448## CPU architecture specific assembly 448## CPU architecture specific assembly
@@ -661,7 +661,7 @@ EFL_LIB_START_OPTIONAL([Escape], [test "${have_ps3}" = "yes"])
661### Checks for programs 661### Checks for programs
662 662
663### Checks for libraries 663### Checks for libraries
664EFL_ADD_LIBS([ESCAPE], [-llv2]) 664EFL_ADD_LIBS([ESCAPE], [-llv2 -lm -lnet -lsysmodule -liberty])
665 665
666### Checks for header files 666### Checks for header files
667 667
@@ -747,10 +747,10 @@ AC_DEFINE_IF([EINA_STRINGSHARE_USAGE],
747### Checks for programs 747### Checks for programs
748 748
749### Checks for libraries 749### Checks for libraries
750
751## Compatibility layers
752EFL_PLATFORM_DEPEND([EINA], [all]) 750EFL_PLATFORM_DEPEND([EINA], [all])
753 751
752EFL_ADD_LIBS([EINA], [-lm])
753
754## Options 754## Options
755 755
756# Valgrind 756# Valgrind
@@ -857,6 +857,8 @@ EFL_LIB_START([Eet])
857EFL_PLATFORM_DEPEND([EET], [evil]) 857EFL_PLATFORM_DEPEND([EET], [evil])
858EFL_CRYPTO_DEPEND([EET]) 858EFL_CRYPTO_DEPEND([EET])
859 859
860EFL_ADD_LIBS([EET], [-lm])
861
860# Cryptography support 862# Cryptography support
861if test "$build_crypto" != "none" ; then 863if test "$build_crypto" != "none" ; then
862 AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet]) 864 AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet])
@@ -1290,8 +1292,7 @@ if test "${have_wince}" = "yes"; then
1290 want_evas_image_loader_webp="no" 1292 want_evas_image_loader_webp="no"
1291fi 1293fi
1292 1294
1293EFL_CHECK_FUNC([DLSYM], [dlsym]) 1295EFL_CHECK_FUNC([EVAS], [dlsym])
1294EFL_ADD_LIBS([EVAS], [${DLSYM_LIBS}])
1295 1296
1296if test "x${efl_func_dlsym}" = "xno" && test "${with_opengl}" != "none"; then 1297if test "x${efl_func_dlsym}" = "xno" && test "${with_opengl}" != "none"; then
1297 AC_MSG_ERROR([OpenGL cannot work without dlsym()]) 1298 AC_MSG_ERROR([OpenGL cannot work without dlsym()])
@@ -1307,6 +1308,8 @@ EFL_INTERNAL_DEPEND_PKG([EVAS], [eo])
1307EFL_INTERNAL_DEPEND_PKG([EVAS], [eet]) 1308EFL_INTERNAL_DEPEND_PKG([EVAS], [eet])
1308EFL_INTERNAL_DEPEND_PKG([EVAS], [eina]) 1309EFL_INTERNAL_DEPEND_PKG([EVAS], [eina])
1309 1310
1311EFL_ADD_LIBS([EVAS], [-lm])
1312
1310# Freetype 1313# Freetype
1311EFL_DEPEND_PKG([EVAS], [FREETYPE], [freetype2 >= 9.3.0]) 1314EFL_DEPEND_PKG([EVAS], [FREETYPE], [freetype2 >= 9.3.0])
1312 1315
@@ -1678,6 +1681,8 @@ EFL_LIB_START([Embryo])
1678EFL_PLATFORM_DEPEND([EMBRYO], [all]) 1681EFL_PLATFORM_DEPEND([EMBRYO], [all])
1679EFL_INTERNAL_DEPEND_PKG([EMBRYO], [eina]) 1682EFL_INTERNAL_DEPEND_PKG([EMBRYO], [eina])
1680 1683
1684EFL_ADD_LIBS([EMBRYO], [-lm])
1685
1681### Checks for header files 1686### Checks for header files
1682 1687
1683### Checks for types 1688### Checks for types
@@ -1764,6 +1769,8 @@ EFL_PLATFORM_DEPEND([ECORE], [all])
1764EFL_INTERNAL_DEPEND_PKG([ECORE], [eo]) 1769EFL_INTERNAL_DEPEND_PKG([ECORE], [eo])
1765EFL_INTERNAL_DEPEND_PKG([ECORE], [eina]) 1770EFL_INTERNAL_DEPEND_PKG([ECORE], [eina])
1766 1771
1772EFL_ADD_LIBS([ECORE], [-lm])
1773
1767# glib 1774# glib
1768 1775
1769EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_glib}], [GLIB], [glib-2.0]) 1776EFL_OPTIONAL_DEPEND_PKG([ECORE], [${want_glib}], [GLIB], [glib-2.0])
@@ -1910,6 +1917,8 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eet])
1910EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eina]) 1917EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eina])
1911EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore]) 1918EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore])
1912 1919
1920EFL_ADD_LIBS([ECORE_CON], [-lm])
1921
1913EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_curl}], [CURL], [libcurl]) 1922EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_curl}], [CURL], [libcurl])
1914 1923
1915EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_cares}], 1924EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_cares}],
@@ -2004,6 +2013,8 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con])
2004EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore]) 2013EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore])
2005EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina]) 2014EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina])
2006 2015
2016EFL_ADD_LIBS([ECORE_IPC], [-lm])
2017
2007### Checks for header files 2018### Checks for header files
2008 2019
2009AC_CHECK_HEADERS([winsock2.h]) 2020AC_CHECK_HEADERS([winsock2.h])
@@ -2392,6 +2403,8 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore])
2392EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet]) 2403EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet])
2393EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina]) 2404EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina])
2394 2405
2406EFL_ADD_LIBS([ECORE_AUDIO], [-lm])
2407
2395EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_alsa}], [ALSA], [alsa]) 2408EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_alsa}], [ALSA], [alsa])
2396EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_pulseaudio}], [PULSE], [libpulse]) 2409EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_pulseaudio}], [PULSE], [libpulse])
2397EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_sndfile}], [SNDFILE], [sndfile]) 2410EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_sndfile}], [SNDFILE], [sndfile])
@@ -3185,6 +3198,7 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
3185EFL_LIB_END([Efreet]) 3198EFL_LIB_END([Efreet])
3186#### End of Efreet 3199#### End of Efreet
3187 3200
3201EFL_LIBS="${EFL_LIBS} ${requirements_libs_efl}"
3188 3202
3189 3203
3190AC_CONFIG_FILES([ 3204AC_CONFIG_FILES([