diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2014-09-04 17:10:37 +0200 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2014-09-04 17:33:05 +0200 |
commit | de14acab86b68367c3e2c601d7bce3650427ffa8 (patch) | |
tree | 0baf6800f2f5ed71a10c78da190e15ef1d75dbaa /configure.ac | |
parent | 7ae9a2e0440e32b77b9f39992fc4bc6cf454dc1c (diff) |
autotools: simplify .pc.in.
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 2d2514752..dbcf406a1 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -185,16 +185,16 @@ EFL_ENABLE_BIN([elementary-config]) | |||
185 | 185 | ||
186 | ### Checks for libraries | 186 | ### Checks for libraries |
187 | 187 | ||
188 | requirement_elm="" | 188 | requirement_elm_pc="" |
189 | 189 | ||
190 | case "$host_os" in | 190 | case "$host_os" in |
191 | mingw*) | 191 | mingw*) |
192 | requirement_elm="evil >= efl_version" | 192 | requirement_elm_pc="evil >= efl_version" |
193 | ;; | 193 | ;; |
194 | esac | 194 | esac |
195 | 195 | ||
196 | requirement_elm="\ | 196 | requirement_elm_pc="\ |
197 | ${requirement_elm} \ | 197 | ${requirement_elm_pc} \ |
198 | efl >= efl_version \ | 198 | efl >= efl_version \ |
199 | eina >= efl_version \ | 199 | eina >= efl_version \ |
200 | eet >= efl_version \ | 200 | eet >= efl_version \ |
@@ -232,8 +232,7 @@ ELM_CHECK_OPTION([eweather], [0.2.0]) | |||
232 | ELM_CHECK_OPTION([emap], [0.1.0]) | 232 | ELM_CHECK_OPTION([emap], [0.1.0]) |
233 | ELM_CHECK_OPTION([eweb]) | 233 | ELM_CHECK_OPTION([eweb]) |
234 | 234 | ||
235 | PKG_CHECK_MODULES([ELEMENTARY], | 235 | PKG_CHECK_MODULES([ELEMENTARY], [${requirement_elm_pc}]) |
236 | [${requirement_elm}]) | ||
237 | 236 | ||
238 | EFL_ENABLE_EO_API_SUPPORT | 237 | EFL_ENABLE_EO_API_SUPPORT |
239 | EFL_ENABLE_BETA_API_SUPPORT | 238 | EFL_ENABLE_BETA_API_SUPPORT |
@@ -247,7 +246,7 @@ if test "x${HAVE_CXX11}" = "x1" -a "x${want_cxx11}" = "xyes"; then | |||
247 | evas-cxx >= efl_version | 246 | evas-cxx >= efl_version |
248 | ], | 247 | ], |
249 | [ | 248 | [ |
250 | requirement_elm="${requirement_elm} \ | 249 | requirement_elm_pc="${requirement_elm_pc} \ |
251 | eo-cxx >= efl_version \ | 250 | eo-cxx >= efl_version \ |
252 | eina-cxx >= efl_version \ | 251 | eina-cxx >= efl_version \ |
253 | evas-cxx >= efl_version \ | 252 | evas-cxx >= efl_version \ |
@@ -273,7 +272,7 @@ AC_DEFINE_UNQUOTED([MODULE_EDJE], ["$MODULE_EDJE"], ["Edje module architecture"] | |||
273 | DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo evas edje ecore efl` | 272 | DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo evas edje ecore efl` |
274 | AC_SUBST([DEPS_EOLIAN_FLAGS]) | 273 | AC_SUBST([DEPS_EOLIAN_FLAGS]) |
275 | 274 | ||
276 | my_libs="-lm" | 275 | requirement_elm_libs="-lm" |
277 | 276 | ||
278 | # sockets | 277 | # sockets |
279 | 278 | ||
@@ -285,7 +284,7 @@ case "$host_os" in | |||
285 | AC_CHECK_LIB([socket], [connect], | 284 | AC_CHECK_LIB([socket], [connect], |
286 | [ | 285 | [ |
287 | have_socket="yes" | 286 | have_socket="yes" |
288 | my_libs="-lsocket ${my_libs}" | 287 | requirement_elm_libs="-lsocket ${requirement_elm_libs}" |
289 | ], | 288 | ], |
290 | [have_socket="no"]) | 289 | [have_socket="no"]) |
291 | ;; | 290 | ;; |
@@ -307,7 +306,7 @@ case "$host_os" in | |||
307 | dnl managed by evil | 306 | dnl managed by evil |
308 | AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.]) | 307 | AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.]) |
309 | have_dlopen="yes" | 308 | have_dlopen="yes" |
310 | my_libs="-ldl ${my_libs}" | 309 | requirement_elm_libs="-ldl ${requirement_elm_libs}" |
311 | ;; | 310 | ;; |
312 | *solaris*) | 311 | *solaris*) |
313 | have_dlopen="yes" | 312 | have_dlopen="yes" |
@@ -319,7 +318,7 @@ dnl managed by evil | |||
319 | AC_CHECK_LIB([dl], [dlopen], [res=yes], [res=no]) | 318 | AC_CHECK_LIB([dl], [dlopen], [res=yes], [res=no]) |
320 | if test "x$res" = "xyes"; then | 319 | if test "x$res" = "xyes"; then |
321 | AC_CHECK_LIB([dl], [dladdr], AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.])) | 320 | AC_CHECK_LIB([dl], [dladdr], AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.])) |
322 | my_libs="-ldl ${my_libs}" | 321 | requirement_elm_libs="-ldl ${requirement_elm_libs}" |
323 | have_dlopen="yes" | 322 | have_dlopen="yes" |
324 | fi | 323 | fi |
325 | ;; | 324 | ;; |
@@ -327,8 +326,9 @@ esac | |||
327 | 326 | ||
328 | AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) | 327 | AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) |
329 | 328 | ||
330 | AC_SUBST([my_libs]) | 329 | ELEMENTARY_LIBS="${ELEMENTARY_LIBS} ${requirement_elm_libs}" |
331 | AC_SUBST([requirement_elm]) | 330 | |
331 | AC_SUBST([requirement_elm_pc]) | ||
332 | 332 | ||
333 | # check unit testing library | 333 | # check unit testing library |
334 | if test "${build_tests}" = "regular"; then | 334 | if test "${build_tests}" = "regular"; then |