diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/eet/configure.ac | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rw-r--r-- | libraries/eet/configure.ac | 139 |
1 files changed, 99 insertions, 40 deletions
diff --git a/libraries/eet/configure.ac b/libraries/eet/configure.ac index 220e2a1..eb3c7e5 100644 --- a/libraries/eet/configure.ac +++ b/libraries/eet/configure.ac | |||
@@ -1,12 +1,12 @@ | |||
1 | y##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 1 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
3 | m4_define([v_maj], [1]) | 3 | m4_define([v_maj], [1]) |
4 | m4_define([v_min], [5]) | 4 | m4_define([v_min], [6]) |
5 | m4_define([v_mic], [99]) | 5 | m4_define([v_mic], [0]) |
6 | m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) | 6 | m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) |
7 | m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) | 7 | m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) |
8 | ##-- When released, remove the dnl on the below line | 8 | ##-- When released, remove the dnl on the below line |
9 | dnl m4_undefine([v_rev]) | 9 | m4_undefine([v_rev]) |
10 | ##-- When doing snapshots - change soname. remove dnl on below line | 10 | ##-- When doing snapshots - change soname. remove dnl on below line |
11 | dnl m4_define([relname], [ver-pre-svn-05]) | 11 | dnl m4_define([relname], [ver-pre-svn-05]) |
12 | dnl m4_define([v_rel], [-release relname]) | 12 | dnl m4_define([v_rel], [-release relname]) |
@@ -18,7 +18,7 @@ m4_define([lt_age], v_min) | |||
18 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 18 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
19 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 19 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
20 | 20 | ||
21 | AC_INIT([eet], [v_ver], [enlightenment-devel@lists.sourceforge.net]) | 21 | AC_INIT([eet], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net]) |
22 | AC_PREREQ([2.52]) | 22 | AC_PREREQ([2.52]) |
23 | AC_CONFIG_SRCDIR([configure.ac]) | 23 | AC_CONFIG_SRCDIR([configure.ac]) |
24 | AC_CONFIG_MACRO_DIR([m4]) | 24 | AC_CONFIG_MACRO_DIR([m4]) |
@@ -110,39 +110,6 @@ else | |||
110 | AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format]) | 110 | AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format]) |
111 | fi | 111 | fi |
112 | 112 | ||
113 | # Gnutls support | ||
114 | |||
115 | AC_ARG_ENABLE([gnutls], | ||
116 | [AC_HELP_STRING([--disable-gnutls], [disable gnutls eet support])], | ||
117 | [want_gnutls=$enableval] | ||
118 | ) | ||
119 | AC_MSG_CHECKING([whether to use Gnutls]) | ||
120 | AC_MSG_RESULT([${want_gnutls}]) | ||
121 | |||
122 | # Specific GNUTLS improvement | ||
123 | |||
124 | new_gnutls_api="yes" | ||
125 | AC_ARG_ENABLE(new-gnutls-api, | ||
126 | [AC_HELP_STRING( | ||
127 | [--disable-new-gnutls-api], | ||
128 | [enable use of gnutls_x509_crt_verify_hash. [[default=enable]]] | ||
129 | )], | ||
130 | [new_gnutls_api=$enableval] | ||
131 | ) | ||
132 | AC_MSG_CHECKING([whether to use gnutls_x509_crt_verify_hash]) | ||
133 | AC_MSG_RESULT([${new_gnutls_api}]) | ||
134 | |||
135 | if test "x${new_gnutls_api}" = "xyes" ; then | ||
136 | AC_CHECK_LIB(gnutls, gnutls_x509_crt_verify_hash, | ||
137 | [ new_gnutls_api="yes" ], | ||
138 | [ new_gnutls_api="no" ] | ||
139 | ) | ||
140 | |||
141 | if test "x${new_gnutls_api}" = "xyes"; then | ||
142 | AC_DEFINE(EET_USE_NEW_GNUTLS_API, 1, [use gnutls_x509_crt_verify_hash]) | ||
143 | fi | ||
144 | fi | ||
145 | |||
146 | # Openssl support | 113 | # Openssl support |
147 | 114 | ||
148 | AC_ARG_ENABLE([openssl], | 115 | AC_ARG_ENABLE([openssl], |
@@ -264,8 +231,30 @@ AC_SUBST(EET_LIBS) | |||
264 | 231 | ||
265 | # Eina library | 232 | # Eina library |
266 | 233 | ||
267 | PKG_CHECK_MODULES(EINA, [eina >= 1.1.0]) | 234 | PKG_CHECK_MODULES(EINA, [eina >= 1.2.0]) |
268 | requirement_eet="eina >= 1.1.0 ${requirement_eet}" | 235 | requirement_eet="eina >= 1.2.0 ${requirement_eet}" |
236 | |||
237 | ### Checks for portability layer | ||
238 | |||
239 | PKG_CHECK_MODULES([EXOTIC], | ||
240 | [exotic], | ||
241 | [enable_exotic="yes"], | ||
242 | [enable_exotic="no"]) | ||
243 | |||
244 | if test "x${enable_exotic}" = "xyes"; then | ||
245 | requirement_eet="exotic ${requirement_eet}" | ||
246 | |||
247 | AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.]) | ||
248 | fi | ||
249 | |||
250 | # Gnutls support | ||
251 | |||
252 | AC_ARG_ENABLE([gnutls], | ||
253 | [AC_HELP_STRING([--disable-gnutls], [disable gnutls eet support])], | ||
254 | [want_gnutls=$enableval] | ||
255 | ) | ||
256 | AC_MSG_CHECKING([whether to use Gnutls]) | ||
257 | AC_MSG_RESULT([${want_gnutls}]) | ||
269 | 258 | ||
270 | # Gnutls library | 259 | # Gnutls library |
271 | have_gnutls="no" | 260 | have_gnutls="no" |
@@ -287,6 +276,76 @@ if test "x${want_gnutls}" = "xyes" || test "x${want_gnutls}" = "xauto" ; then | |||
287 | fi | 276 | fi |
288 | fi | 277 | fi |
289 | 278 | ||
279 | # Specific GNUTLS improvement | ||
280 | |||
281 | new_gnutls_api="yes" | ||
282 | AC_ARG_ENABLE(new-gnutls-api, | ||
283 | [AC_HELP_STRING( | ||
284 | [--disable-new-gnutls-api], | ||
285 | [enable use of gnutls_x509_crt_verify_hash. [[default=enable]]] | ||
286 | )], | ||
287 | [new_gnutls_api=$enableval] | ||
288 | ) | ||
289 | AC_MSG_CHECKING([whether to use gnutls_x509_crt_verify_hash]) | ||
290 | AC_MSG_RESULT([${new_gnutls_api}]) | ||
291 | |||
292 | if test "x${new_gnutls_api}" = "xyes" ; then | ||
293 | tmp_CFLAGS="${CFLAGS}" | ||
294 | tmp_LIBS="${LIBS}" | ||
295 | CFLAGS="${GNUTLS_CFLAGS}" | ||
296 | LIBS="${GNUTLS_LIBS}" | ||
297 | AC_CHECK_LIB(gnutls, gnutls_x509_crt_verify_hash, | ||
298 | [ new_gnutls_api="yes" ], | ||
299 | [ new_gnutls_api="no" ] | ||
300 | ) | ||
301 | CFLAGS="${tmp_CFLAGS}" | ||
302 | LIBS="${tmp_LIBS}" | ||
303 | |||
304 | if test "x${new_gnutls_api}" = "xyes"; then | ||
305 | AC_DEFINE(EET_USE_NEW_GNUTLS_API, 1, [use gnutls_x509_crt_verify_hash]) | ||
306 | fi | ||
307 | fi | ||
308 | |||
309 | use_gnutls_privkey_sign_data="no" | ||
310 | if test "x${want_gnutls}" = "xyes" -o "x${want_gnutls}" = "xauto"; then | ||
311 | tmp_CFLAGS="${CFLAGS}" | ||
312 | tmp_LIBS="${LIBS}" | ||
313 | CFLAGS="${GNUTLS_CFLAGS}" | ||
314 | LIBS="${GNUTLS_LIBS}" | ||
315 | AC_CHECK_LIB(gnutls, gnutls_privkey_sign_data, | ||
316 | [ use_gnutls_privkey_sign_data="yes" ], | ||
317 | [ use_gnutls_privkey_sign_data="no" ] | ||
318 | ) | ||
319 | CFLAGS="${tmp_CFLAGS}" | ||
320 | LIBS="${tmp_LIBS}" | ||
321 | |||
322 | if test "x${use_gnutls_privkey_sign_data}" = "xyes"; then | ||
323 | AC_DEFINE(EET_USE_NEW_PRIVKEY_SIGN_DATA, 1, [use gnutls_privkey_sign_data]) | ||
324 | fi | ||
325 | fi | ||
326 | AC_MSG_CHECKING([whether to use gnutls_privkey_sign_data]) | ||
327 | AC_MSG_RESULT([${use_gnutls_privkey_sign_data}]) | ||
328 | |||
329 | use_gnutls_pubkey_verify_hash="no" | ||
330 | if test "x${want_gnutls}" = "xyes" -o "x${want_gnutls}" = "xauto"; then | ||
331 | tmp_CFLAGS="${CFLAGS}" | ||
332 | tmp_LIBS="${LIBS}" | ||
333 | CFLAGS="${GNUTLS_CFLAGS}" | ||
334 | LIBS="${GNUTLS_LIBS}" | ||
335 | AC_CHECK_LIB(gnutls, gnutls_pubkey_verify_hash, | ||
336 | [ use_gnutls_pubkey_verify_hash="yes" ], | ||
337 | [ use_gnutls_pubkey_verify_hash="no" ] | ||
338 | ) | ||
339 | CFLAGS="${tmp_CFLAGS}" | ||
340 | LIBS="${tmp_LIBS}" | ||
341 | |||
342 | if test "x${use_gnutls_pubkey_verify_hash}" = "xyes"; then | ||
343 | AC_DEFINE(EET_USE_NEW_PUBKEY_VERIFY_HASH, 1, [use gnutls_pubkey_verify_hash]) | ||
344 | fi | ||
345 | fi | ||
346 | AC_MSG_CHECKING([whether to use gnutls_pubkey_verify_hash]) | ||
347 | AC_MSG_RESULT([${use_gnutls_pubkey_verify_hash}]) | ||
348 | |||
290 | # Openssl library | 349 | # Openssl library |
291 | have_openssl="no" | 350 | have_openssl="no" |
292 | if test "x${want_openssl}" = "xyes" || test "x${want_openssl}" = "xauto" ; then | 351 | if test "x${want_openssl}" = "xyes" || test "x${want_openssl}" = "xauto" ; then |