diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-17 20:58:07 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-17 20:58:07 +0000 |
commit | 12a0f9388a03d30d17c4eaa3a00566adc7689df7 (patch) | |
tree | e036cd53638528c7d1d6f42f103443bc859ce6de /m4/efl.m4 | |
parent | b830048a649a66d1132b940eac7367f5d2af613a (diff) |
clean some whitelines from already lengthly configure file.
SVN revision: 82951
Diffstat (limited to '')
-rw-r--r-- | m4/efl.m4 | 62 |
1 files changed, 28 insertions, 34 deletions
@@ -153,7 +153,7 @@ dnl EFL_DEPEND_PKG(EFL, NAME, PACKAGE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | |||
153 | dnl Adds a pkg-config dependency to an efl, AC_DEFINE() HAVE_NAME, | 153 | dnl Adds a pkg-config dependency to an efl, AC_DEFINE() HAVE_NAME, |
154 | dnl and inserts dependencies in proper variables | 154 | dnl and inserts dependencies in proper variables |
155 | AC_DEFUN([EFL_DEPEND_PKG], | 155 | AC_DEFUN([EFL_DEPEND_PKG], |
156 | [ | 156 | [dnl |
157 | m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl | 157 | m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl |
158 | m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl | 158 | m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl |
159 | m4_pushdef([UPNAME], m4_translit([$2], [-a-z], [_A-Z]))dnl | 159 | m4_pushdef([UPNAME], m4_translit([$2], [-a-z], [_A-Z]))dnl |
@@ -179,15 +179,14 @@ m4_popdef([UPEFL]) | |||
179 | 179 | ||
180 | dnl EFL_OPTIONAL_DEPEND_PKG(EFL, VARIABLE, NAME, PACKAGE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | 180 | dnl EFL_OPTIONAL_DEPEND_PKG(EFL, VARIABLE, NAME, PACKAGE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
181 | AC_DEFUN([EFL_OPTIONAL_DEPEND_PKG], | 181 | AC_DEFUN([EFL_OPTIONAL_DEPEND_PKG], |
182 | [ | 182 | [dnl |
183 | m4_pushdef([DOWN], m4_translit([$3], [-A-Z], [_a-z]))dnl | 183 | m4_pushdef([DOWN], m4_translit([$3], [-A-Z], [_a-z]))dnl |
184 | 184 | ||
185 | have_[]m4_defn([DOWN])="no" | 185 | have_[]m4_defn([DOWN])="no" |
186 | if test "x$2" = "xyes"; then | 186 | if test "x$2" = "xyes"; then |
187 | EFL_DEPEND_PKG([$1], [$3], [$4], [$5], [$6]) | 187 | EFL_DEPEND_PKG([$1], [$3], [$4], [$5], [$6]) |
188 | fi | 188 | fi |
189 | 189 | m4_popdef([DOWN])dnl | |
190 | m4_popdef([DOWN]) | ||
191 | ]) | 190 | ]) |
192 | 191 | ||
193 | dnl EFL_OPTIONAL_INTERNAL_DEPEND_PKG(EFL, VARIABLE, NAME) | 192 | dnl EFL_OPTIONAL_INTERNAL_DEPEND_PKG(EFL, VARIABLE, NAME) |
@@ -274,7 +273,7 @@ dnl requirements_internal_deps_libs_pkg: external libraries that are public | |||
274 | dnl dependencies (due internal libs). | 273 | dnl dependencies (due internal libs). |
275 | dnl | 274 | dnl |
276 | AC_DEFUN([EFL_LIB_START], | 275 | AC_DEFUN([EFL_LIB_START], |
277 | [ | 276 | [dnl |
278 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl | 277 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl |
279 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl | 278 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl |
280 | 279 | ||
@@ -293,27 +292,25 @@ USE_[]m4_defn([UP])_INTERNAL_LIBS="${USE_[]m4_defn([UP])_INTERNAL_LIBS}" | |||
293 | m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS}" | 292 | m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS}" |
294 | m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}" | 293 | m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}" |
295 | 294 | ||
296 | AC_SUBST([requirements_libs_]m4_defn([DOWN])) | 295 | AC_SUBST([requirements_libs_]m4_defn([DOWN]))dnl |
297 | AC_SUBST([requirements_public_libs_]m4_defn([DOWN])) | 296 | AC_SUBST([requirements_public_libs_]m4_defn([DOWN]))dnl |
298 | AC_SUBST([requirements_cflags_]m4_defn([DOWN])) | 297 | AC_SUBST([requirements_cflags_]m4_defn([DOWN]))dnl |
299 | AC_SUBST([requirements_pc_]m4_defn([DOWN])) | 298 | AC_SUBST([requirements_pc_]m4_defn([DOWN]))dnl |
300 | AC_SUBST(m4_defn([UP])[_LIBS]) | 299 | AC_SUBST(m4_defn([UP])[_LIBS])dnl |
301 | AC_SUBST(m4_defn([UP])[_INTERNAL_LIBS]) | 300 | AC_SUBST(m4_defn([UP])[_INTERNAL_LIBS])dnl |
302 | AC_SUBST([USE_]m4_defn([UP])[_LIBS]) | 301 | AC_SUBST([USE_]m4_defn([UP])[_LIBS])dnl |
303 | AC_SUBST([USE_]m4_defn([UP])[_INTERNAL_LIBS]) | 302 | AC_SUBST([USE_]m4_defn([UP])[_INTERNAL_LIBS])dnl |
304 | AC_SUBST(m4_defn([UP])[_LDFLAGS]) | 303 | AC_SUBST(m4_defn([UP])[_LDFLAGS])dnl |
305 | AC_SUBST(m4_defn([UP])[_CFLAGS]) | 304 | AC_SUBST(m4_defn([UP])[_CFLAGS])dnl |
306 | 305 | AC_MSG_NOTICE([Start $1 checks])dnl | |
307 | AC_MSG_NOTICE([Start $1 checks]) | 306 | m4_popdef([UP])dnl |
308 | 307 | m4_popdef([DOWN])dnl | |
309 | m4_popdef([UP]) | ||
310 | m4_popdef([DOWN]) | ||
311 | ]) | 308 | ]) |
312 | 309 | ||
313 | dnl EFL_LIB_END(PKG) | 310 | dnl EFL_LIB_END(PKG) |
314 | dnl finishes the setup of an EFL library | 311 | dnl finishes the setup of an EFL library |
315 | AC_DEFUN([EFL_LIB_END], | 312 | AC_DEFUN([EFL_LIB_END], |
316 | [ | 313 | [dnl |
317 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl | 314 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl |
318 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl | 315 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl |
319 | 316 | ||
@@ -334,16 +331,16 @@ m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS} ${EFL_CFLAGS} -I\$(top_srcdir)/src | |||
334 | requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}" | 331 | requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}" |
335 | requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}" | 332 | requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}" |
336 | 333 | ||
337 | AC_MSG_NOTICE([Finished $1 checks]) | 334 | AC_MSG_NOTICE([Finished $1 checks])dnl |
338 | m4_popdef([UP]) | 335 | m4_popdef([UP])dnl |
339 | m4_popdef([DOWN]) | 336 | m4_popdef([DOWN])dnl |
340 | ]) | 337 | ]) |
341 | 338 | ||
342 | dnl EFL_LIB_START_OPTIONAL(PKG, TEST) | 339 | dnl EFL_LIB_START_OPTIONAL(PKG, TEST) |
343 | dnl test if library should be build and then EFL_LIB_START() | 340 | dnl test if library should be build and then EFL_LIB_START() |
344 | dnl must call EFL_LIB_END_OPTIONAL() to close it. | 341 | dnl must call EFL_LIB_END_OPTIONAL() to close it. |
345 | AC_DEFUN([EFL_LIB_START_OPTIONAL], | 342 | AC_DEFUN([EFL_LIB_START_OPTIONAL], |
346 | [ | 343 | [dnl |
347 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl | 344 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl |
348 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl | 345 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl |
349 | 346 | ||
@@ -357,18 +354,16 @@ fi | |||
357 | if test "$efl_lib_optional_[]m4_defn([DOWN])" = "yes"; then | 354 | if test "$efl_lib_optional_[]m4_defn([DOWN])" = "yes"; then |
358 | EFL_LIB_START([$1]) | 355 | EFL_LIB_START([$1]) |
359 | AC_DEFINE([HAVE_]m4_defn([UP]), [1], [optional EFL $1 is enabled]) | 356 | AC_DEFINE([HAVE_]m4_defn([UP]), [1], [optional EFL $1 is enabled]) |
360 | |||
361 | dnl closed at EFL_LIB_END_OPTIONAL() | 357 | dnl closed at EFL_LIB_END_OPTIONAL() |
362 | 358 | m4_popdef([UP])dnl | |
363 | m4_popdef([UP]) | 359 | m4_popdef([DOWN])dnl |
364 | m4_popdef([DOWN]) | ||
365 | ]) | 360 | ]) |
366 | 361 | ||
367 | dnl EFL_LIB_END_OPTIONAL(PKG) | 362 | dnl EFL_LIB_END_OPTIONAL(PKG) |
368 | dnl closes block started by EFL_LIB_START_OPTIONAL() and then | 363 | dnl closes block started by EFL_LIB_START_OPTIONAL() and then |
369 | dnl defines AM_CONDITIONAL([HAVE_PKG]) and AC_DEFINE([HAVE_PKG]) | 364 | dnl defines AM_CONDITIONAL([HAVE_PKG]) and AC_DEFINE([HAVE_PKG]) |
370 | AC_DEFUN([EFL_LIB_END_OPTIONAL], | 365 | AC_DEFUN([EFL_LIB_END_OPTIONAL], |
371 | [ | 366 | [dnl |
372 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl | 367 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl |
373 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl | 368 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl |
374 | 369 | ||
@@ -376,8 +371,7 @@ dnl close if started at EFL_LIB_START_OPTIONAL() | |||
376 | EFL_LIB_END([$1]) | 371 | EFL_LIB_END([$1]) |
377 | fi | 372 | fi |
378 | 373 | ||
379 | AM_CONDITIONAL([HAVE_]m4_defn([UP]), [test "$efl_lib_optional_[]m4_defn([DOWN])" = "yes"]) | 374 | AM_CONDITIONAL([HAVE_]m4_defn([UP]), [test "$efl_lib_optional_[]m4_defn([DOWN])" = "yes"])dnl |
380 | 375 | m4_popdef([UP])dnl | |
381 | m4_popdef([UP]) | 376 | m4_popdef([DOWN])dnl |
382 | m4_popdef([DOWN]) | ||
383 | ]) | 377 | ]) |