diff options
author | Heikki Lindholm <holin@iki.fi> | 2009-02-17 20:38:34 +0000 |
---|---|---|
committer | Heikki Lindholm <holin@iki.fi> | 2009-02-17 20:38:34 +0000 |
commit | 7b6b408cc4dd89ddead611d0f45def886480c82d (patch) | |
tree | d3c8d4b85601917b2f0eaba91dc854d31b01cf35 | |
parent | fe8b7d92cdf5074c9e95a090707fad9642ff2e4f (diff) | |
download | libmicrohttpd-7b6b408cc4dd89ddead611d0f45def886480c82d.tar.gz libmicrohttpd-7b6b408cc4dd89ddead611d0f45def886480c82d.zip |
pkg-config without https, too
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | libmicrohttpd.pc.in | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b66538b3..4936aa01 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -131,7 +131,8 @@ netbsd*) | |||
131 | esac | 131 | esac |
132 | 132 | ||
133 | 133 | ||
134 | 134 | # for pkg-config | |
135 | MHD_LIBDEPS="" | ||
135 | 136 | ||
136 | CHECK_PTHREAD | 137 | CHECK_PTHREAD |
137 | LIBS="$PTHREAD_LIBS $LIBS" | 138 | LIBS="$PTHREAD_LIBS $LIBS" |
@@ -242,6 +243,7 @@ then | |||
242 | if test "$gcrypt" = "true" | 243 | if test "$gcrypt" = "true" |
243 | then | 244 | then |
244 | AC_DEFINE([HTTPS_SUPPORT],[1],[include HTTPS support]) | 245 | AC_DEFINE([HTTPS_SUPPORT],[1],[include HTTPS support]) |
246 | MHD_LIBDEPS="$LIBGCRYPT_LIBS" | ||
245 | else | 247 | else |
246 | AC_DEFINE([HTTPS_SUPPORT],[0],[no libgcrypt]) | 248 | AC_DEFINE([HTTPS_SUPPORT],[0],[no libgcrypt]) |
247 | enable_https="no (lacking libgcrypt)" | 249 | enable_https="no (lacking libgcrypt)" |
@@ -290,6 +292,8 @@ AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) | |||
290 | 292 | ||
291 | AC_SUBST(MHD_LIB_LDFLAGS) | 293 | AC_SUBST(MHD_LIB_LDFLAGS) |
292 | 294 | ||
295 | # for pkg-config | ||
296 | AC_SUBST(MHD_LIBDEPS) | ||
293 | 297 | ||
294 | AC_SUBST(CPPFLAGS) | 298 | AC_SUBST(CPPFLAGS) |
295 | AC_SUBST(LIBS) | 299 | AC_SUBST(LIBS) |
diff --git a/libmicrohttpd.pc.in b/libmicrohttpd.pc.in index fd3e8c92..54ce379d 100644 --- a/libmicrohttpd.pc.in +++ b/libmicrohttpd.pc.in | |||
@@ -9,5 +9,5 @@ Version: @VERSION@ | |||
9 | Requires: | 9 | Requires: |
10 | Conflicts: | 10 | Conflicts: |
11 | Libs: -L${libdir} -lmicrohttpd | 11 | Libs: -L${libdir} -lmicrohttpd |
12 | Libs.private: @LIBGCRYPT_LIBS@ | 12 | Libs.private: @MHD_LIBDEPS@ |
13 | Cflags: -I${includedir} | 13 | Cflags: -I${includedir} |