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 /m4 | |
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 'm4')
-rw-r--r-- | m4/efl_check_funcs.m4 | 2 | ||||
-rw-r--r-- | m4/efl_check_libs.m4 | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/m4/efl_check_funcs.m4 b/m4/efl_check_funcs.m4 index d72fb34344..1611633a15 100644 --- a/m4/efl_check_funcs.m4 +++ b/m4/efl_check_funcs.m4 | |||
@@ -85,7 +85,6 @@ case "$host_os" in | |||
85 | mingw*) | 85 | mingw*) |
86 | _efl_have_fct="yes" | 86 | _efl_have_fct="yes" |
87 | requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl" | 87 | requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl" |
88 | m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -ldl" | ||
89 | ;; | 88 | ;; |
90 | *) | 89 | *) |
91 | _efl_have_fct="no" | 90 | _efl_have_fct="no" |
@@ -151,7 +150,6 @@ case "$host_os" in | |||
151 | mingw*) | 150 | mingw*) |
152 | _efl_have_fct="yes" | 151 | _efl_have_fct="yes" |
153 | requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl" | 152 | requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl" |
154 | m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -ldl" | ||
155 | ;; | 153 | ;; |
156 | *) | 154 | *) |
157 | _efl_have_fct="no" | 155 | _efl_have_fct="no" |
diff --git a/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4 index b1c37894b6..cbdb11b795 100644 --- a/m4/efl_check_libs.m4 +++ b/m4/efl_check_libs.m4 | |||
@@ -26,6 +26,7 @@ if test "x${have_dep}" = "xyes" ; then | |||
26 | [ | 26 | [ |
27 | have_dep="yes" | 27 | have_dep="yes" |
28 | requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg" | 28 | requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg" |
29 | requirements_libs_deps_[]m4_defn([DOWNEFL])="${requirements_libs_deps_[]m4_defn([DOWNEFL])} -ljpeg" | ||
29 | ], | 30 | ], |
30 | [ | 31 | [ |
31 | AC_MSG_ERROR("Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file") | 32 | AC_MSG_ERROR("Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file") |
@@ -47,16 +48,12 @@ AC_DEFUN([_EFL_CHECK_LIB_ZLIB], | |||
47 | m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl | 48 | m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl |
48 | m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl | 49 | m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl |
49 | 50 | ||
50 | PKG_CHECK_EXISTS([zlib], | 51 | PKG_CHECK_EXISTS([zlib >= 1.2.3], [_efl_have_lib="yes"], [_efl_have_lib="no"]) |
51 | [ | ||
52 | _efl_have_lib="yes" | ||
53 | requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} zlib" | ||
54 | ], | ||
55 | [ | ||
56 | _efl_have_lib="no" | ||
57 | ]) | ||
58 | 52 | ||
59 | if test "x${_efl_have_lib}" = "xno" ; then | 53 | if test "x${_efl_have_lib}" = "xyes" ; then |
54 | requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} zlib >= 1.2.3" | ||
55 | requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_[]m4_defn([DOWNEFL])} zlib >= 1.2.3" | ||
56 | else | ||
60 | AC_CHECK_HEADER([zlib.h], | 57 | AC_CHECK_HEADER([zlib.h], |
61 | [_efl_have_lib="yes"], | 58 | [_efl_have_lib="yes"], |
62 | [ | 59 | [ |
@@ -69,6 +66,7 @@ if test "x${_efl_have_lib}" = "xno" ; then | |||
69 | [ | 66 | [ |
70 | _efl_have_lib="yes" | 67 | _efl_have_lib="yes" |
71 | requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz" | 68 | requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz" |
69 | requirements_libs_deps_[]m4_defn([DOWNEFL])="${requirements_libs_deps_[]m4_defn([DOWNEFL])} -lz" | ||
72 | ], | 70 | ], |
73 | [ | 71 | [ |
74 | AC_MSG_ERROR(["Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file"]) | 72 | AC_MSG_ERROR(["Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file"]) |