diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2012-09-21 08:15:58 +0000 |
---|---|---|
committer | Vincent Torri <vincent.torri@gmail.com> | 2012-09-21 08:15:58 +0000 |
commit | ab144cb47475bface1ece6fc9869b135cd4a8ab7 (patch) | |
tree | 714691a2f49a9a1f1b2ff14e2640c6b5bf74d2a5 /configure.ac | |
parent | 1bc1eaaba3699bd23f5334ab31b9c84cefc77681 (diff) |
merge: fix compilation when no EFL is installed...
tested on linux and windows.
And disable valgrind as there's a link problem in eet binary,
i'll check that later
SVN revision: 76938
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 96 |
1 files changed, 69 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index b0ba6e4ace..d1bb640c61 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -80,6 +80,21 @@ requirements_libs_emotion="" | |||
80 | requirements_libs_ethumb="" | 80 | requirements_libs_ethumb="" |
81 | requirements_libs_elementary="" | 81 | requirements_libs_elementary="" |
82 | 82 | ||
83 | requirements_libs_deps_evil="" | ||
84 | requirements_libs_deps_eina="" | ||
85 | requirements_libs_deps_eet="" | ||
86 | requirements_libs_deps_evas="" | ||
87 | requirements_libs_deps_ecore="" | ||
88 | requirements_libs_deps_embryo="" | ||
89 | requirements_libs_deps_eio="" | ||
90 | requirements_libs_deps_edje="" | ||
91 | requirements_libs_deps_efreet="" | ||
92 | requirements_libs_deps_e_dbus="" | ||
93 | requirements_libs_deps_eeze="" | ||
94 | requirements_libs_deps_emotion="" | ||
95 | requirements_libs_deps_ethumb="" | ||
96 | requirements_libs_deps_elementary="" | ||
97 | |||
83 | requirements_pc_eina="" | 98 | requirements_pc_eina="" |
84 | requirements_pc_eet="" | 99 | requirements_pc_eet="" |
85 | requirements_pc_evas="" | 100 | requirements_pc_evas="" |
@@ -94,6 +109,20 @@ requirements_pc_emotion="" | |||
94 | requirements_pc_ethumb="" | 109 | requirements_pc_ethumb="" |
95 | requirements_pc_elementary="" | 110 | requirements_pc_elementary="" |
96 | 111 | ||
112 | requirements_pc_deps_eina="" | ||
113 | requirements_pc_deps_eet="" | ||
114 | requirements_pc_deps_evas="" | ||
115 | requirements_pc_deps_ecore="" | ||
116 | requirements_pc_deps_embryo="" | ||
117 | requirements_pc_deps_eio="" | ||
118 | requirements_pc_deps_edje="" | ||
119 | requirements_pc_deps_efreet="" | ||
120 | requirements_pc_deps_e_dbus="" | ||
121 | requirements_pc_deps_eeze="" | ||
122 | requirements_pc_deps_emotion="" | ||
123 | requirements_pc_deps_ethumb="" | ||
124 | requirements_pc_deps_elementary="" | ||
125 | |||
97 | AC_SUBST([requirements_libs_evil]) | 126 | AC_SUBST([requirements_libs_evil]) |
98 | AC_SUBST([requirements_libs_eina]) | 127 | AC_SUBST([requirements_libs_eina]) |
99 | AC_SUBST([requirements_libs_eet]) | 128 | AC_SUBST([requirements_libs_eet]) |
@@ -310,7 +339,7 @@ AC_CHECK_HEADERS([errno.h]) | |||
310 | 339 | ||
311 | EVIL_CPPFLAGS="-DEFL_EVIL_BUILD" | 340 | EVIL_CPPFLAGS="-DEFL_EVIL_BUILD" |
312 | EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1" | 341 | EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1" |
313 | EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -mms-bitfields" | 342 | EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wpointer-arith -mms-bitfields" |
314 | EVIL_CXXFLAGS="" | 343 | EVIL_CXXFLAGS="" |
315 | 344 | ||
316 | if test "x${have_win32}" = "xyes" ; then | 345 | if test "x${have_win32}" = "xyes" ; then |
@@ -457,6 +486,22 @@ AC_MSG_RESULT([${enable_benchmark_e17}]) | |||
457 | 486 | ||
458 | AM_CONDITIONAL([EINA_ENABLE_BENCHMARK_E17], [test "x${enable_benchmark_e17}" = "xyes"]) | 487 | AM_CONDITIONAL([EINA_ENABLE_BENCHMARK_E17], [test "x${enable_benchmark_e17}" = "xyes"]) |
459 | 488 | ||
489 | # Valgrind | ||
490 | |||
491 | AC_ARG_ENABLE([valgrind], | ||
492 | [AC_HELP_STRING([--enable-valgrind], [improve valgrind support by hinting it of our memory usages, having it to report proper mempool leaks. @<:@default=no@:>@])], | ||
493 | [ | ||
494 | if test "x${enableval}" = "xyes" ; then | ||
495 | want_valgrind="yes" | ||
496 | else | ||
497 | want_valgrind="no" | ||
498 | fi | ||
499 | ], | ||
500 | [want_valgrind="no"]) | ||
501 | |||
502 | AC_MSG_CHECKING([whether to enable build with valgrind]) | ||
503 | AC_MSG_RESULT([${want_valgrind}]) | ||
504 | |||
460 | ### Checks for programs | 505 | ### Checks for programs |
461 | 506 | ||
462 | ### Checks for libraries | 507 | ### Checks for libraries |
@@ -468,7 +513,6 @@ AM_CONDITIONAL([EINA_ENABLE_BENCHMARK_E17], [test "x${enable_benchmark_e17}" = " | |||
468 | EFL_EINA_BUILD="" | 513 | EFL_EINA_BUILD="" |
469 | case "$host_os" in | 514 | case "$host_os" in |
470 | mingw*) | 515 | mingw*) |
471 | PKG_CHECK_EXISTS([evil >= 1.6.99]) | ||
472 | AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) | 516 | AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) |
473 | requirements_pc_eina="${requirements_pc_eina} evil" | 517 | requirements_pc_eina="${requirements_pc_eina} evil" |
474 | EFL_EINA_BUILD="-DEFL_EINA_BUILD" | 518 | EFL_EINA_BUILD="-DEFL_EINA_BUILD" |
@@ -500,33 +544,16 @@ PKG_CHECK_EXISTS([exotic], | |||
500 | AM_CONDITIONAL([EINA_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"]) | 544 | AM_CONDITIONAL([EINA_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"]) |
501 | AC_SUBST([EINA_CONFIGURE_HAVE_EXOTIC]) | 545 | AC_SUBST([EINA_CONFIGURE_HAVE_EXOTIC]) |
502 | 546 | ||
503 | if ! test "x${requirements_pc_eina}" = "x" ; then | ||
504 | PKG_CHECK_MODULES([EINA], [${requirements_pc_eina}]) | ||
505 | fi | ||
506 | |||
507 | ## Options | 547 | ## Options |
508 | 548 | ||
509 | # Valgrind | 549 | # Valgrind |
510 | 550 | ||
511 | AC_ARG_ENABLE([valgrind], | ||
512 | [AC_HELP_STRING([--enable-valgrind], [improve valgrind support by hinting it of our memory usages, having it to report proper mempool leaks.])], | ||
513 | [ | ||
514 | if test "x${enableval}" = "xyes" ; then | ||
515 | want_valgrind="yes" | ||
516 | else | ||
517 | want_valgrind="no" | ||
518 | fi | ||
519 | ], | ||
520 | [want_valgrind="auto"]) | ||
521 | |||
522 | AC_MSG_CHECKING([whether to enable build with valgrind]) | ||
523 | AC_MSG_RESULT([${want_valgrind}]) | ||
524 | |||
525 | if test "x${want_valgrind}" = "xyes" || test "x${want_valgrind}" = "xauto"; then | 551 | if test "x${want_valgrind}" = "xyes" || test "x${want_valgrind}" = "xauto"; then |
526 | PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0], | 552 | PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0], |
527 | [ | 553 | [ |
528 | have_valgrind="yes" | 554 | have_valgrind="yes" |
529 | requirements_pc_eina="valgrind ${requirements_pc_eina}" | 555 | requirements_pc_eina="valgrind >= 2.4.0 ${requirements_pc_eina}" |
556 | requirements_pc_deps_eina="valgrind ${requirements_pc_deps_eina}" | ||
530 | ], | 557 | ], |
531 | [ | 558 | [ |
532 | have_valgrind="no" | 559 | have_valgrind="no" |
@@ -590,6 +617,12 @@ if test "x${enable_ememoa}" = "xyes" ; then | |||
590 | [enable_ememoa="no"]) | 617 | [enable_ememoa="no"]) |
591 | fi | 618 | fi |
592 | 619 | ||
620 | if ! test "x${requirements_pc_deps_eina}" = "x" ; then | ||
621 | PKG_CHECK_MODULES([EINA], [${requirements_pc_deps_eina}]) | ||
622 | fi | ||
623 | |||
624 | |||
625 | |||
593 | ## Examples | 626 | ## Examples |
594 | 627 | ||
595 | PKG_CHECK_MODULES([ECORE_EVAS], | 628 | PKG_CHECK_MODULES([ECORE_EVAS], |
@@ -677,7 +710,7 @@ m4_ifdef([v_ver], | |||
677 | EFL_CHECK_COMPILER_FLAGS([EINA], [-Wall -Wextra]) | 710 | EFL_CHECK_COMPILER_FLAGS([EINA], [-Wall -Wextra]) |
678 | ]) | 711 | ]) |
679 | 712 | ||
680 | EFL_CHECK_COMPILER_FLAGS([EINA], [-Wshadow]) | 713 | EFL_CHECK_COMPILER_FLAGS([EINA], [-Wshadow -Wpointer-arith]) |
681 | 714 | ||
682 | ### Checks for linker characteristics | 715 | ### Checks for linker characteristics |
683 | 716 | ||
@@ -854,7 +887,6 @@ AC_MSG_RESULT([${want_signature}]) | |||
854 | EFL_EET_BUILD="" | 887 | EFL_EET_BUILD="" |
855 | case "$host_os" in | 888 | case "$host_os" in |
856 | mingw*) | 889 | mingw*) |
857 | PKG_CHECK_EXISTS([evil >= 1.1.0]) | ||
858 | AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) | 890 | AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) |
859 | requirements_pc_eet="evil ${requirements_pc_eet}" | 891 | requirements_pc_eet="evil ${requirements_pc_eet}" |
860 | EFL_EET_BUILD="-DEFL_EET_BUILD" | 892 | EFL_EET_BUILD="-DEFL_EET_BUILD" |
@@ -884,6 +916,7 @@ if test "x${want_gnutls}" = "xyes" || test "x${want_gnutls}" = "xauto" ; then | |||
884 | want_openssl="no" | 916 | want_openssl="no" |
885 | AC_DEFINE([HAVE_GNUTLS], [1], [Have Gnutls support]) | 917 | AC_DEFINE([HAVE_GNUTLS], [1], [Have Gnutls support]) |
886 | requirements_pc_eet="gnutls >= 1.7.6 ${requirements_pc_eet}" | 918 | requirements_pc_eet="gnutls >= 1.7.6 ${requirements_pc_eet}" |
919 | requirements_pc_deps_eet="gnutls >= 1.7.6 ${requirements_pc_deps_eet}" | ||
887 | ], | 920 | ], |
888 | [have_gnutls="no"]) | 921 | [have_gnutls="no"]) |
889 | fi | 922 | fi |
@@ -894,6 +927,7 @@ if test "x${have_gnutls}" = "xyes" ; then | |||
894 | AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"]) | 927 | AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"]) |
895 | if test "x${have_gnutls}" = "xyes" ; then | 928 | if test "x${have_gnutls}" = "xyes" ; then |
896 | requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}" | 929 | requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}" |
930 | requirements_libs_deps_eet="${LIBGCRYPT_LIBS} ${requirements_libs_deps_eet}" | ||
897 | fi | 931 | fi |
898 | fi | 932 | fi |
899 | 933 | ||
@@ -977,6 +1011,7 @@ if test "x${want_openssl}" = "xyes" || test "x${want_openssl}" = "xauto" ; then | |||
977 | have_openssl="yes" | 1011 | have_openssl="yes" |
978 | AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support]) | 1012 | AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support]) |
979 | requirements_pc_eet="openssl ${requirements_pc_eet}" | 1013 | requirements_pc_eet="openssl ${requirements_pc_eet}" |
1014 | requirements_pc_deps_eet="openssl ${requirements_pc_deps_eet}" | ||
980 | ], | 1015 | ], |
981 | [have_openssl="no"]) | 1016 | [have_openssl="no"]) |
982 | fi | 1017 | fi |
@@ -1017,23 +1052,28 @@ AC_MSG_RESULT([${have_signature}]) | |||
1017 | 1052 | ||
1018 | # libjpeg and zlib | 1053 | # libjpeg and zlib |
1019 | 1054 | ||
1020 | EFL_CHECK_LIBS([eet], [libjpeg zlib]) | 1055 | EFL_CHECK_LIBS([EET], [libjpeg zlib]) |
1021 | 1056 | ||
1022 | # Eina library | 1057 | # Eina library |
1023 | 1058 | ||
1024 | requirements_pc_eet="eina >= 1.2.0 ${requirements_pc_eet}" | 1059 | requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}" |
1025 | PKG_CHECK_MODULES([EET], [${requirements_pc_eet}]) | 1060 | |
1061 | PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}]) | ||
1062 | |||
1063 | # Windows | ||
1026 | 1064 | ||
1027 | case "$host_os" in | 1065 | case "$host_os" in |
1028 | mingw32ce*) | 1066 | mingw32ce*) |
1029 | requirements_libs_eet="${requirements_libs_eet} -lws2" | 1067 | requirements_libs_eet="${requirements_libs_eet} -lws2" |
1068 | requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2" | ||
1030 | ;; | 1069 | ;; |
1031 | mingw*) | 1070 | mingw*) |
1032 | requirements_libs_eet="${requirements_libs_eet} -lws2_32" | 1071 | requirements_libs_eet="${requirements_libs_eet} -lws2_32" |
1072 | requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2_32" | ||
1033 | ;; | 1073 | ;; |
1034 | esac | 1074 | esac |
1035 | 1075 | ||
1036 | EET_LIBS="${EET_LIBS} ${requirements_libs_eet}" | 1076 | EET_LIBS="${EET_LIBS} ${requirements_libs_deps_eet}" |
1037 | 1077 | ||
1038 | ### Checks for header files | 1078 | ### Checks for header files |
1039 | 1079 | ||
@@ -1069,6 +1109,8 @@ if test ! "x${have_null}" = "xyes" ; then | |||
1069 | AC_MSG_WARN([Your system is a bit too funny, eet might not work properly]) | 1109 | AC_MSG_WARN([Your system is a bit too funny, eet might not work properly]) |
1070 | fi | 1110 | fi |
1071 | 1111 | ||
1112 | EFL_CHECK_COMPILER_FLAGS([EET], [-Wshadow -Wpointer-arith]) | ||
1113 | |||
1072 | ### Checks for linker characteristics | 1114 | ### Checks for linker characteristics |
1073 | 1115 | ||
1074 | case "${host_os}" in | 1116 | case "${host_os}" in |