summaryrefslogtreecommitdiff
path: root/m4/efl.m4
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2013-01-17 01:52:32 +0000
committerCedric BAIL <cedric.bail@free.fr>2013-01-17 01:52:32 +0000
commit0bcbfcf4c19bbd5a9f319d30c0e63c9bcfa7e687 (patch)
tree87e1a76b6a7ce21fbc6c638ca633d89fd0b49af5 /m4/efl.m4
parentd8b2bce148e56809abb0a0982c29ed3f3c33e57f (diff)
efl: revert r82909 as it break build.
Symptom are dependencies is full of -lm -lrt -lsomething that can't be found in the Makefile target. SVN revision: 82914
Diffstat (limited to 'm4/efl.m4')
-rw-r--r--m4/efl.m413
1 files changed, 8 insertions, 5 deletions
diff --git a/m4/efl.m4 b/m4/efl.m4
index 90e4cb7c39..cbd379171b 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -108,7 +108,6 @@ esac
108requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}" 108requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
109requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNEFL])}" 109requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
110requirements_internal_libs_[]m4_defn([DOWNEFL])="lib/${libdirname}/lib${libname}.la ${requirements_internal_libs_[][]m4_defn([DOWNEFL])}" 110requirements_internal_libs_[]m4_defn([DOWNEFL])="lib/${libdirname}/lib${libname}.la ${requirements_internal_libs_[][]m4_defn([DOWNEFL])}"
111requirements_internal_deps_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNOTHER])} ${requirements_internal_deps_libs_[][]m4_defn([DOWNEFL])}"
112m4_popdef([DOWNOTHER])dnl 111m4_popdef([DOWNOTHER])dnl
113m4_popdef([DOWNEFL])dnl 112m4_popdef([DOWNEFL])dnl
114]) 113])
@@ -192,10 +191,15 @@ m4_popdef([DOWN])
192 191
193dnl EFL_OPTIONAL_INTERNAL_DEPEND_PKG(EFL, VARIABLE, NAME) 192dnl EFL_OPTIONAL_INTERNAL_DEPEND_PKG(EFL, VARIABLE, NAME)
194AC_DEFUN([EFL_OPTIONAL_INTERNAL_DEPEND_PKG], 193AC_DEFUN([EFL_OPTIONAL_INTERNAL_DEPEND_PKG],
195[dnl 194[
195m4_pushdef([DOWN], m4_translit([$3], [-A-Z], [_a-z]))dnl
196
197 have_[]m4_defn([DOWN])="no"
196 if test "x$2" = "xyes"; then 198 if test "x$2" = "xyes"; then
197 EFL_INTERNAL_DEPEND_PKG([$1], [$3]) 199 EFL_INTERNAL_DEPEND_PKG([$1], [$3])
198 fi 200 fi
201
202m4_popdef([DOWN])
199]) 203])
200 204
201dnl EFL_ADD_LIBS(PKG, LIBS) 205dnl EFL_ADD_LIBS(PKG, LIBS)
@@ -226,7 +230,6 @@ m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
226m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl 230m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
227 231
228requirements_internal_libs_[]m4_defn([DOWN])="" 232requirements_internal_libs_[]m4_defn([DOWN])=""
229requirements_internal_deps_libs_[]m4_defn([DOWN])=""
230requirements_libs_[]m4_defn([DOWN])="" 233requirements_libs_[]m4_defn([DOWN])=""
231requirements_cflags_[]m4_defn([DOWN])="" 234requirements_cflags_[]m4_defn([DOWN])=""
232requirements_pc_[]m4_defn([DOWN])="" 235requirements_pc_[]m4_defn([DOWN])=""
@@ -271,10 +274,10 @@ case "m4_defn([DOWN])" in
271esac 274esac
272 275
273m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS} ${EFL_COV_CFLAGS} ${EFL_LDFLAGS}" 276m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS} ${EFL_COV_CFLAGS} ${EFL_LDFLAGS}"
274m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} ${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])} ${requirements_internal_deps_libs_[]m4_defn([DOWN])} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl} " 277m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} ${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl} "
275m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}" 278m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
276USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la" 279USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
277USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la ${requirements_internal_deps_libs_[]m4_defn([DOWN])}" 280USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
278m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS} ${EFL_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl} -DEFL_[]m4_defn([UP])_BUILD=1" 281m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS} ${EFL_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl} -DEFL_[]m4_defn([UP])_BUILD=1"
279requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}" 282requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}"
280requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}" 283requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}"