diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 2befdd31..e61cc1c3 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1405,7 +1405,22 @@ AS_IF([test "x$with_gnutls" != "xno" && test "x$have_gnutls" != "xyes"], | |||
1405 | [ | 1405 | [ |
1406 | AS_IF([[test "x$host_os" = "xsolaris2.11" && test "x$cross_compiling" = "xno"]], | 1406 | AS_IF([[test "x$host_os" = "xsolaris2.11" && test "x$cross_compiling" = "xno"]], |
1407 | [ | 1407 | [ |
1408 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[char size_chk[sizeof(char*)-7];]], [[]])], | 1408 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
1409 | char size_chk[7-sizeof(char*)]; | ||
1410 | #if defined(_LP64) || defined(__LP64__) || defined(__x86_64) || defined(__x86_64__) | ||
1411 | #error This is 64-bit target. | ||
1412 | choke me now | ||
1413 | #endif | ||
1414 | #if defined(__amd64) || defined(__amd64__) || defined(__sparcv9) || defined(__sparc_v9__) | ||
1415 | #error This is 64-bit target. | ||
1416 | choke me now | ||
1417 | #endif | ||
1418 | ]], [[]] | ||
1419 | ) | ||
1420 | ], | ||
1421 | [ | ||
1422 | mhd_cv_pkgconf_add_dirs='/usr/lib/pkgconfig/gnutls-3' | ||
1423 | ], | ||
1409 | [ | 1424 | [ |
1410 | AS_IF([[test "x$host_cpu" = "xx86_64" || test "x$host_cpu" = "xi386"]], | 1425 | AS_IF([[test "x$host_cpu" = "xx86_64" || test "x$host_cpu" = "xi386"]], |
1411 | [[mhd_cv_pkgconf_add_dirs='/usr/lib/amd64/pkgconfig/gnutls-3:/usr/lib/amd64/pkgconfig']], | 1426 | [[mhd_cv_pkgconf_add_dirs='/usr/lib/amd64/pkgconfig/gnutls-3:/usr/lib/amd64/pkgconfig']], |
@@ -1413,9 +1428,6 @@ AS_IF([test "x$with_gnutls" != "xno" && test "x$have_gnutls" != "xyes"], | |||
1413 | [[mhd_cv_pkgconf_add_dirs='/usr/lib/sparkv9/pkgconfig/gnutls-3:/usr/lib/sparkv9/pkgconfig']], | 1428 | [[mhd_cv_pkgconf_add_dirs='/usr/lib/sparkv9/pkgconfig/gnutls-3:/usr/lib/sparkv9/pkgconfig']], |
1414 | [[mhd_cv_pkgconf_add_dirs='/usr/lib/64/pkgconfig/gnutls-3:/usr/lib/64/pkgconfig']] | 1429 | [[mhd_cv_pkgconf_add_dirs='/usr/lib/64/pkgconfig/gnutls-3:/usr/lib/64/pkgconfig']] |
1415 | ) | 1430 | ) |
1416 | ], | ||
1417 | [ | ||
1418 | mhd_cv_pkgconf_add_dirs='/usr/lib/pkgconfig/gnutls-3' | ||
1419 | ] | 1431 | ] |
1420 | ) | 1432 | ) |
1421 | ], | 1433 | ], |
@@ -1427,6 +1439,7 @@ AS_IF([test "x$with_gnutls" != "xno" && test "x$have_gnutls" != "xyes"], | |||
1427 | [ | 1439 | [ |
1428 | test "x$PKG_CONFIG_PATH" = "x" || PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PATH_SEPARATOR}" | 1440 | test "x$PKG_CONFIG_PATH" = "x" || PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PATH_SEPARATOR}" |
1429 | PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${mhd_cv_pkgconf_add_dirs}" | 1441 | PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${mhd_cv_pkgconf_add_dirs}" |
1442 | export PKG_CONFIG_PATH | ||
1430 | ] | 1443 | ] |
1431 | ) | 1444 | ) |
1432 | PKG_CHECK_MODULES(GNUTLS, [[gnutls]], | 1445 | PKG_CHECK_MODULES(GNUTLS, [[gnutls]], |