summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-10-10 22:12:29 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-10-10 22:12:29 +0000
commit5b77d2068a4f8cc93eace20ea70339f8aaa0a158 (patch)
tree0530a895409409c72639b1e560575c5934281767
parentcf5ba612bb34ddde3ee4c8746f72725982847a9b (diff)
efl: helper macro and remove duplicated defines.
AC_CHECK_HEADERS() will already define HAVE_STDINT_H and HAVE_INTTYPES_H. SVN revision: 77834
Diffstat (limited to '')
-rw-r--r--configure.ac25
-rw-r--r--m4/ac_define_if.m47
2 files changed, 15 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index ca6201ceef..8642846e67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,9 +330,9 @@ if test -n "$with_max_log_level"; then
330 AC_DEFINE_UNQUOTED([EINA_LOG_LEVEL_MAXIMUM], [${with_max_log_level}], [if set, logging is limited to this amount.]) 330 AC_DEFINE_UNQUOTED([EINA_LOG_LEVEL_MAXIMUM], [${with_max_log_level}], [if set, logging is limited to this amount.])
331fi 331fi
332 332
333if test "x${have_stringshare_usage}" = "xyes"; then 333AC_DEFINE_IF([EINA_STRINGSHARE_USAGE],
334 AC_DEFINE([EINA_STRINGSHARE_USAGE], [1], [Report Eina stringshare usage pattern]) 334 [test "x${have_stringshare_usage}" = "xyes"],
335fi 335 [1], [Report Eina stringshare usage pattern])
336 336
337### Checks for programs 337### Checks for programs
338 338
@@ -383,9 +383,9 @@ else
383 AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled]) 383 AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled])
384fi 384fi
385 385
386if test "x${ac_cv_func_malloc_usable_size}" = "xyes" && test "x${want_debug_malloc}" = "xyes"; then 386AC_DEFINE_IF([EINA_DEBUG_MALLOC],
387 AC_DEFINE([EINA_DEBUG_MALLOC], [1], [Turn on debugging overhead in mempool]) 387 [test "x${ac_cv_func_malloc_usable_size}" = "xyes" -a "x${want_debug_malloc}" = "xyes"],
388fi 388 [1], [Turn on debugging overhead in mempool])
389 389
390## Modules 390## Modules
391if ! test "x${requirements_pc_deps_eina}" = "x" ; then 391if ! test "x${requirements_pc_deps_eina}" = "x" ; then
@@ -434,14 +434,6 @@ CFLAGS="${CFLAGS_save}"
434EINA_CONFIG(HAVE_INTTYPES_H, test "x${ac_cv_header_inttypes_h}" = "xyes") 434EINA_CONFIG(HAVE_INTTYPES_H, test "x${ac_cv_header_inttypes_h}" = "xyes")
435EINA_CONFIG(HAVE_STDINT_H, test "x${ac_cv_header_inttypes_h}" = "xyes") 435EINA_CONFIG(HAVE_STDINT_H, test "x${ac_cv_header_inttypes_h}" = "xyes")
436 436
437if test "x${ac_cv_header_inttypes_h}" = "xyes" ; then
438 AC_DEFINE([HAVE_INTTYPES_H], [1], [Define to 1 if you have the <inttypes.h> header file.])
439fi
440
441if test "x${ac_cv_header_inttypes_h}" = "xyes" ; then
442 AC_DEFINE([HAVE_STDINT_H], [1], [Define to 1 if you have the <stdint.h> header file.])
443fi
444
445### Checks for types 437### Checks for types
446 438
447# wchar_t 439# wchar_t
@@ -465,9 +457,8 @@ AC_CHECK_TYPES([struct dirent], [have_dirent="yes"], [have_dirent="no"],
465 ]]) 457 ]])
466 458
467EINA_CONFIG(HAVE_DIRENT_H, test "x${have_dirent}" = "xyes") 459EINA_CONFIG(HAVE_DIRENT_H, test "x${have_dirent}" = "xyes")
468if test "x${have_dirent}" = "xyes" ; then 460AC_DEFINE_IF([HAVE_DIRENT_H], [test "x${have_dirent}" = "xyes"],
469 AC_DEFINE([HAVE_DIRENT_H], [1], [Define to 1 if you have a valid <dirent.h> header file.]) 461 [1], [Define to 1 if you have a valid <dirent.h> header file.])
470fi
471 462
472### Checks for structures 463### Checks for structures
473 464
diff --git a/m4/ac_define_if.m4 b/m4/ac_define_if.m4
new file mode 100644
index 0000000000..961ca64452
--- /dev/null
+++ b/m4/ac_define_if.m4
@@ -0,0 +1,7 @@
1dnl use: AC_DEFINE_IF(id, testcond, val, comment)
2AC_DEFUN([AC_DEFINE_IF],
3[
4if $2; then
5 AC_DEFINE($1, $3, $4)
6fi
7])