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