diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-09-21 11:11:28 +0900 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-09-21 11:11:28 +0900 |
commit | 43c7552411379c17e5548dd1d22375a7847bfa2c (patch) | |
tree | 2e4aae3101b5e596b473b73a165156749a4884e4 /configure.ac | |
parent | b1970bec0059bc2ff7fcc9d14f15c4c1a059a106 (diff) |
elm - we should not get our pc files to use hidden libs like x/wl
ecore_x, ecore_wl, ecore_drm etc. were being linked to clients as they
were added to the pc file - they should not have been. elm hides
these. it's meant to hide them. remove them from the pc file.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 119e4375d..951a38577 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -190,8 +190,7 @@ case "$host_os" in | |||
190 | ;; | 190 | ;; |
191 | esac | 191 | esac |
192 | 192 | ||
193 | requirement_elm_pc="\ | 193 | requirement_elm_pc_only="\ |
194 | ${requirement_elm_pc} \ | ||
195 | efl >= efl_version \ | 194 | efl >= efl_version \ |
196 | eina >= efl_version \ | 195 | eina >= efl_version \ |
197 | eet >= efl_version \ | 196 | eet >= efl_version \ |
@@ -214,6 +213,11 @@ requirement_elm_pc="\ | |||
214 | eio >= efl_version \ | 213 | eio >= efl_version \ |
215 | " | 214 | " |
216 | 215 | ||
216 | requirement_elm_pc="\ | ||
217 | ${requirement_elm_pc} \ | ||
218 | ${requirement_elm_pc_only} \ | ||
219 | " | ||
220 | |||
217 | ELM_CHECK_BACKEND([X]) | 221 | ELM_CHECK_BACKEND([X]) |
218 | ELM_CHECK_BACKEND([FB]) | 222 | ELM_CHECK_BACKEND([FB]) |
219 | ELM_CHECK_BACKEND([PSL1GHT]) | 223 | ELM_CHECK_BACKEND([PSL1GHT]) |
@@ -230,6 +234,7 @@ ELM_CHECK_OPTION([emap], [0.1.0]) | |||
230 | ELM_CHECK_OPTION([eweb]) | 234 | ELM_CHECK_OPTION([eweb]) |
231 | 235 | ||
232 | PKG_CHECK_MODULES([ELEMENTARY], [${requirement_elm_pc}]) | 236 | PKG_CHECK_MODULES([ELEMENTARY], [${requirement_elm_pc}]) |
237 | PKG_CHECK_MODULES([ELEMENTARY_PC], [${requirement_elm_pc_only}]) | ||
233 | 238 | ||
234 | EFL_ENABLE_EO_API_SUPPORT | 239 | EFL_ENABLE_EO_API_SUPPORT |
235 | EFL_ENABLE_BETA_API_SUPPORT | 240 | EFL_ENABLE_BETA_API_SUPPORT |
@@ -326,6 +331,7 @@ esac | |||
326 | AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) | 331 | AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) |
327 | 332 | ||
328 | ELEMENTARY_LIBS="${ELEMENTARY_LIBS} ${requirement_elm_libs}" | 333 | ELEMENTARY_LIBS="${ELEMENTARY_LIBS} ${requirement_elm_libs}" |
334 | ELEMENTARY_PC_LIBS="${ELEMENTARY_PC_LIBS} ${requirement_elm_libs}" | ||
329 | 335 | ||
330 | AC_SUBST([requirement_elm_pc]) | 336 | AC_SUBST([requirement_elm_pc]) |
331 | 337 | ||