build: make xkbcommon public where it is included in the header filedevs/bu5hm4n/for-simotek

Otherwise buildfailure like T4413 can happen.

This should fix T4413

@fix

5 files changed, 31 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index df9131060d..b7b8736f86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3557,6 +3557,8 @@ fi
 ### Checks for programs
 
 ### Checks for libraries
+EFL_ADD_PUBLIC_PC([ECORE_WAYLAND], [xkbcommon >= 0.5.0])
+
 EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore-input])
 EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eo])
@@ -3597,6 +3599,8 @@ fi
 ### Checks for programs
 
 ### Checks for libraries
+EFL_ADD_PUBLIC_PC([ECORE_WL2], [xkbcommon >= 0.6.0])
+
 EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [ecore-input])
 EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [eo])
@@ -3677,6 +3681,9 @@ AC_SUBST([SUID_LDFLAGS])
 ### Checks for programs
 
 ### Checks for libraries
+
+EFL_ADD_PUBLIC_PC([ECORE_DRM], [xkbcommon >= 0.3.0])
+
 EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [ecore-input])
 EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eldbus])
@@ -3737,6 +3744,8 @@ AC_SUBST([SUID_LDFLAGS])
 ### Checks for programs
 
 ### Checks for libraries
+EFL_ADD_PUBLIC_PC([ELPUT], [xkbcommon >= 0.3.0])
+
 EFL_INTERNAL_DEPEND_PKG([ELPUT], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ELPUT], [ecore-input])
 EFL_INTERNAL_DEPEND_PKG([ELPUT], [eldbus])
@@ -5995,7 +6004,7 @@ echo "Ethumb..........: yes"
 echo "Ethumb_Client...: yes"
 echo "Elua............: $have_elua"
 echo "Elementary......: yes (${features_elementary})"
-echo 
+echo
 
 echo
 
diff --git a/m4/efl.m4 b/m4/efl.m4
index f1694c58d5..d79713117d 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -280,6 +280,19 @@ requirements_libs_[]m4_defn([DOWN])="${requirements_libs_[]m4_defn([DOWN])} $2"
 m4_popdef([DOWN])dnl
 ])
 
+dnl EFL_ADD_PUBLIC_PC(PKG, PUBLIC_LIBS)
+dnl Add pkg that the EFL library will depend on when used.
+dnl
+dnl For instance if you use some other library in your header that user
+dnl inclues. While the library has a pkgconfig file.
+AC_DEFUN([EFL_ADD_PUBLIC_PC],
+[dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+requirements_public_pc_[]m4_defn([DOWN])="${requirements_public_pc_[]m4_defn([DOWN])} $2"
+m4_popdef([DOWN])dnl
+])
+
+
 dnl EFL_ADD_PUBLIC_LIBS(PKG, PUBLIC_LIBS)
 dnl Add libraries that the EFL library will depend on when used.
 dnl
@@ -327,6 +340,9 @@ dnl
 dnl     requirements_pc_pkg: all pkg-config (pc) files used by this pkg,
 dnl             includes internal EFL (used in 'Requires.private' in pkg.pc)
 dnl
+dnl     requirements_public_pc_pkg: the pkg-config (pc) files used by the header
+dnl             of this pkg, includes internal EFL (used in 'Requires' in pkg.pc)
+dnl
 dnl     requirements_libs_pkg: external libraries this package needs when
 dnl             linking (used in 'Libs.private' in pkg.pc)
 dnl
@@ -354,6 +370,7 @@ requirements_internal_libs_[]m4_defn([DOWN])=""
 requirements_internal_deps_libs_[]m4_defn([DOWN])=""
 requirements_libs_[]m4_defn([DOWN])=""
 requirements_public_libs_[]m4_defn([DOWN])=""
+requirements_public_pc_[]m4_defn([DOWN])=""
 requirements_cflags_[]m4_defn([DOWN])=""
 requirements_pc_[]m4_defn([DOWN])=""
 requirements_pc_deps_[]m4_defn([DOWN])=""
@@ -367,6 +384,7 @@ m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}"
 
 AC_SUBST([requirements_libs_]m4_defn([DOWN]))dnl
 AC_SUBST([requirements_public_libs_]m4_defn([DOWN]))dnl
+AC_SUBST([requirements_public_pc_]m4_defn([DOWN]))dnl
 AC_SUBST([requirements_cflags_]m4_defn([DOWN]))dnl
 AC_SUBST([requirements_pc_]m4_defn([DOWN]))dnl
 AC_SUBST(m4_defn([UP])[_LIBS])dnl
diff --git a/pc/ecore-wayland.pc.in b/pc/ecore-wayland.pc.in
index b469a10dba..67b93ee5fa 100644
--- a/pc/ecore-wayland.pc.in
+++ b/pc/ecore-wayland.pc.in
@@ -6,6 +6,7 @@ includedir=@includedir@
 Name: ecore-wayland
 Description: E core library, Wayland module
 Requires.private: @requirements_pc_ecore_wayland@
+Requires: @requirements_public_pc_ecore_wayland@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_wayland
 Libs.private: @requirements_libs_ecore_wayland@
diff --git a/pc/ecore-wl2.pc.in b/pc/ecore-wl2.pc.in
index 8f600b8d2a..cbfd842678 100644
--- a/pc/ecore-wl2.pc.in
+++ b/pc/ecore-wl2.pc.in
@@ -6,6 +6,7 @@ includedir=@includedir@
 Name: ecore-wl2
 Description: E core library, Wayland module
 Requires.private: @requirements_pc_ecore_wl2@
+Requires: @requirements_public_pc_ecore_wl2@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_wl2
 Libs.private: @requirements_libs_ecore_wl2@
diff --git a/pc/elput.pc.in b/pc/elput.pc.in
index c345022c06..cc5c94c4a4 100644
--- a/pc/elput.pc.in
+++ b/pc/elput.pc.in
@@ -6,6 +6,7 @@ includedir=@includedir@
 Name: elput
 Description: E core library, libinput module
 Requires.private: @requirements_pc_elput@
+Requires: @requirements_public_pc_elput@
 Version: @VERSION@
 Libs: -L${libdir} -lelput
 Libs.private: @requirements_libs_elput@