diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2015-11-24 11:02:05 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2015-11-24 11:02:05 +0000 |
commit | 12cdc2bcd8d1030ce88633fc2f4f701391b64e00 (patch) | |
tree | 634c701fcdff2a7c2d0cbec82822625ef0c8a025 /configure.ac | |
parent | 12a4dd01cc161b620d717b337b4eb00bc2ba460b (diff) | |
download | libmicrohttpd-12cdc2bcd8d1030ce88633fc2f4f701391b64e00.tar.gz libmicrohttpd-12cdc2bcd8d1030ce88633fc2f4f701391b64e00.zip |
Proper fix for #4062, fix configure errors introduced by SVN 36678
If GNUTLS_LIBS contains any slashes (usual for paths), sed failed with error. Some shells may require quoting of strings with spaces.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index f662383d..87113fd9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -90,9 +90,10 @@ AC_CONFIG_FILES([src/microhttpd/microhttpd_dll_res.rc]) | |||
90 | MHD_LIB_CPPFLAGS="" | 90 | MHD_LIB_CPPFLAGS="" |
91 | MHD_LIB_CFLAGS="" | 91 | MHD_LIB_CFLAGS="" |
92 | MHD_LIB_LDFLAGS="" | 92 | MHD_LIB_LDFLAGS="" |
93 | # for pkg-config | ||
94 | MHD_LIBDEPS="" | 93 | MHD_LIBDEPS="" |
94 | # for pkg-config | ||
95 | MHD_REQ_PRIVATE='' | 95 | MHD_REQ_PRIVATE='' |
96 | MHD_LIBDEPS_PKGCFG='' | ||
96 | 97 | ||
97 | AC_ARG_WITH([threads], | 98 | AC_ARG_WITH([threads], |
98 | [AS_HELP_STRING([--with-threads=LIB],[choose threading library (posix, w32, auto) [auto]])], | 99 | [AS_HELP_STRING([--with-threads=LIB],[choose threading library (posix, w32, auto) [auto]])], |
@@ -257,6 +258,7 @@ if test "x$USE_THREADS" = "xposix"; then | |||
257 | AC_DEFINE([MHD_USE_POSIX_THREADS],[1],[define to use pthreads]) | 258 | AC_DEFINE([MHD_USE_POSIX_THREADS],[1],[define to use pthreads]) |
258 | MHD_LIB_CFLAGS="$MHD_LIB_CFLAGS $PTHREAD_CFLAGS" | 259 | MHD_LIB_CFLAGS="$MHD_LIB_CFLAGS $PTHREAD_CFLAGS" |
259 | MHD_LIBDEPS="$PTHREAD_LIBS $MHD_LIBDEPS" | 260 | MHD_LIBDEPS="$PTHREAD_LIBS $MHD_LIBDEPS" |
261 | MHD_LIBDEPS_PKGCFG="$PTHREAD_LIBS $MHD_LIBDEPS_PKGCFG" | ||
260 | elif test "x$USE_THREADS" = "xw32"; then | 262 | elif test "x$USE_THREADS" = "xw32"; then |
261 | AC_DEFINE([MHD_USE_W32_THREADS],[1],[define to use W32 threads]) | 263 | AC_DEFINE([MHD_USE_W32_THREADS],[1],[define to use W32 threads]) |
262 | fi | 264 | fi |
@@ -849,12 +851,21 @@ if test "x$enable_https" != "xno" | |||
849 | then | 851 | then |
850 | AS_IF([test "x$have_gnutls" = "xyes" && test "x$have_gcrypt" = "xyes"], [ | 852 | AS_IF([test "x$have_gnutls" = "xyes" && test "x$have_gcrypt" = "xyes"], [ |
851 | AC_DEFINE([HTTPS_SUPPORT],[1],[include HTTPS support]) | 853 | AC_DEFINE([HTTPS_SUPPORT],[1],[include HTTPS support]) |
854 | enable_https=yes | ||
855 | MSG_HTTPS="yes (using libgnutls and libgcrypt)" | ||
852 | MHD_LIB_CPPFLAGS="$MHD_LIB_CPPFLAGS $LIBGCRYPT_CFLAGS $GNUTLS_CPPFLAGS" | 856 | MHD_LIB_CPPFLAGS="$MHD_LIB_CPPFLAGS $LIBGCRYPT_CFLAGS $GNUTLS_CPPFLAGS" |
853 | MHD_LIB_CFLAGS="$MHD_LIB_CFLAGS $LIBGCRYPT_CFLAGS $GNUTLS_CFLAGS" | 857 | MHD_LIB_CFLAGS="$MHD_LIB_CFLAGS $LIBGCRYPT_CFLAGS $GNUTLS_CFLAGS" |
854 | MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS $GNUTLS_LDFLAGS" | 858 | MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS $GNUTLS_LDFLAGS" |
855 | MHD_LIBDEPS="$GNUTLS_LIBS $LIBGCRYPT_LIBS $MHD_LIBDEPS" | 859 | MHD_LIBDEPS="$GNUTLS_LIBS $LIBGCRYPT_LIBS $MHD_LIBDEPS" |
856 | enable_https=yes | 860 | AS_IF([[ test "x$have_gnutls_pkgcfg" = "xyes" ]], |
857 | MSG_HTTPS="yes (using libgnutls and libgcrypt)" | 861 | [ # remove GnuTLS from private libs in .pc file as it defined in Requires.private |
862 | MHD_REQ_PRIVATE='gnutls' | ||
863 | MHD_LIBDEPS_PKGCFG="$LIBGCRYPT_LIBS $MHD_LIBDEPS_PKGCFG" | ||
864 | ], | ||
865 | [ | ||
866 | MHD_REQ_PRIVATE='' | ||
867 | MHD_LIBDEPS_PKGCFG="$GNUTLS_LIBS $LIBGCRYPT_LIBS $MHD_LIBDEPS_PKGCFG" | ||
868 | ]) | ||
858 | ], [ | 869 | ], [ |
859 | AS_IF([test "x$have_gnutls" = "xyes"], [crypt_missing="libgrypt"], | 870 | AS_IF([test "x$have_gnutls" = "xyes"], [crypt_missing="libgrypt"], |
860 | [test "x$have_gcrypt" = "xyes"], [crypt_missing="libgnutls"], | 871 | [test "x$have_gcrypt" = "xyes"], [crypt_missing="libgnutls"], |
@@ -926,20 +937,11 @@ AC_SUBST([CPU_COUNT]) | |||
926 | AC_SUBST(MHD_LIB_CPPFLAGS) | 937 | AC_SUBST(MHD_LIB_CPPFLAGS) |
927 | AC_SUBST(MHD_LIB_CFLAGS) | 938 | AC_SUBST(MHD_LIB_CFLAGS) |
928 | AC_SUBST(MHD_LIB_LDFLAGS) | 939 | AC_SUBST(MHD_LIB_LDFLAGS) |
940 | AC_SUBST(MHD_LIBDEPS) | ||
929 | 941 | ||
930 | # for pkg-config | 942 | # for pkg-config |
931 | AS_IF([[test "x$enable_https" = "xyes" && test "x$have_gnutls_pkgcfg" = "xyes" ]], | ||
932 | [ # remove GnuTLS from private libs in .pc file as it defined in Requires.private | ||
933 | MHD_REQ_PRIVATE='gnutls' | ||
934 | MHD_LIBDEPS_PKGCFG=$(echo ${MHD_LIBDEPS} | sed "s/$GNUTLS_LIBS//") | ||
935 | ], | ||
936 | [ | ||
937 | MHD_REQ_PRIVATE='' | ||
938 | MHD_LIBDEPS_PKGCFG="$MHD_LIBDEPS" | ||
939 | ]) | ||
940 | AC_SUBST([MHD_REQ_PRIVATE]) | 943 | AC_SUBST([MHD_REQ_PRIVATE]) |
941 | AC_SUBST([MHD_LIBDEPS_PKGCFG]) | 944 | AC_SUBST([MHD_LIBDEPS_PKGCFG]) |
942 | AC_SUBST(MHD_LIBDEPS) | ||
943 | 945 | ||
944 | AC_SUBST(CPPFLAGS) | 946 | AC_SUBST(CPPFLAGS) |
945 | AC_SUBST(LIBS) | 947 | AC_SUBST(LIBS) |