E SVN: barbieri trunk/efl/m4

[Enlightenment S. <no-...@en...>]

Log:
fix internal library linkage to pull in dependencies.
  
  some libraries will need to pull more than its own .so, for example
  Eina.h includes eina_lock.h that includes eina_inline_lock_posix.x
  that will use pthread calls directly from user code.
  
  This was already listed in eina.pc, but not being present in
  USE_EINA_LIBS.
  
  

Author:       barbieri
Date:         2013-01-16 13:25:58 -0800 (Wed, 16 Jan 2013)
New Revision: 82909
Trac:         http://trac.enlightenment.org/e/changeset/82909

Modified:
  trunk/efl/m4/efl.m4 

Modified: trunk/efl/m4/efl.m4
===================================================================
--- trunk/efl/m4/efl.m4	2013-01-16 21:21:35 UTC (rev 82908)
+++ trunk/efl/m4/efl.m4	2013-01-16 21:25:58 UTC (rev 82909)
@@ -108,6 +108,7 @@
 requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
 requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
 requirements_internal_libs_[]m4_defn([DOWNEFL])="lib/${libdirname}/lib${libname}.la ${requirements_internal_libs_[][]m4_defn([DOWNEFL])}"
+requirements_internal_deps_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNOTHER])} ${requirements_internal_deps_libs_[][]m4_defn([DOWNEFL])}"
 m4_popdef([DOWNOTHER])dnl
 m4_popdef([DOWNEFL])dnl
 ])
@@ -191,15 +192,10 @@
 
 dnl EFL_OPTIONAL_INTERNAL_DEPEND_PKG(EFL, VARIABLE, NAME)
 AC_DEFUN([EFL_OPTIONAL_INTERNAL_DEPEND_PKG],
-[
-m4_pushdef([DOWN], m4_translit([$3], [-A-Z], [_a-z]))dnl
-
-   have_[]m4_defn([DOWN])="no"
+[dnl
    if test "x$2" = "xyes"; then
       EFL_INTERNAL_DEPEND_PKG([$1], [$3])
    fi
-
-m4_popdef([DOWN])
 ])
 
 dnl EFL_ADD_LIBS(PKG, LIBS)
@@ -230,6 +226,7 @@
 m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
 
 requirements_internal_libs_[]m4_defn([DOWN])=""
+requirements_internal_deps_libs_[]m4_defn([DOWN])=""
 requirements_libs_[]m4_defn([DOWN])=""
 requirements_cflags_[]m4_defn([DOWN])=""
 requirements_pc_[]m4_defn([DOWN])=""
@@ -274,10 +271,10 @@
 esac
 
 m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS} ${EFL_COV_CFLAGS} ${EFL_LDFLAGS}"
-m4_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} "
+m4_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} "
 m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
 USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
-USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
+USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la ${requirements_internal_deps_libs_[]m4_defn([DOWN])}"
 m4_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"
 requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}"
 requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}"