[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7949 - in libmicrohttpd: . src/daemon src/daemon/https/lgl
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7949 - in libmicrohttpd: . src/daemon src/daemon/https/lgl src/daemon/https/tls src/daemon/https/x509 |
Date: |
Thu, 20 Nov 2008 02:38:35 -0700 (MST) |
Author: holindho
Date: 2008-11-20 02:38:33 -0700 (Thu, 20 Nov 2008)
New Revision: 7949
Modified:
libmicrohttpd/configure.ac
libmicrohttpd/src/daemon/Makefile.am
libmicrohttpd/src/daemon/https/lgl/Makefile.am
libmicrohttpd/src/daemon/https/tls/Makefile.am
libmicrohttpd/src/daemon/https/x509/Makefile.am
Log:
cleaner gcrypt config
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2008-11-20 09:32:19 UTC (rev 7948)
+++ libmicrohttpd/configure.ac 2008-11-20 09:38:33 UTC (rev 7949)
@@ -204,50 +204,12 @@
# libgcrypt linkage: required for HTTPS support
-AC_MSG_CHECKING(--with-libgcrypt argument)
-AC_ARG_WITH(libgcrypt,
- [AS_HELP_STRING([--with-libgcrypt=PFX],
- [Base of libgcrypt installation])],
- [AC_MSG_RESULT("$with_libgcrypt")
- case $with_libgcrypt in
- no)
- gcrypt=false
- ;;
- yes)
- AC_CHECK_HEADERS([gcrypt.h],
- AC_CHECK_LIB(gcrypt,gcry_prime_generate,
- gcrypt=true,
- gcrypt=false))
- ;;
- *)
- LDFLAGS="-L${with_libgcrypt}lib $LDFLAGS"
- CPPFLAGS="-I${with_libgcrypt}/include $CPPFLAGS"
- AC_CHECK_HEADERS(gcrypt.h,
- # check for 'gcry_prime_generate' in gcrypt.la
- AC_CHECK_LIB(gcrypt,gcry_prime_generate,
- GCRYPT_LIB_PATH="${with_libgcrypt}/lib"
- GCRYPT_LDFLAGS="-L${with_libgcrypt}/lib"
- GCRYPT_CPPFLAGS="-I${with_libgcrypt}/include"
- gcrypt=true,
- gcrypt=false))
- LDFLAGS=$SAVE_LDFLAGS
- CPPFLAGS=$SAVE_CPPFLAGS
- ;;
- esac
- ],
- [AC_MSG_RESULT([not specified])
- AC_CHECK_HEADERS([gcrypt.h],
- AC_CHECK_LIB(gcrypt,gcry_prime_generate,
- gcrypt=true,
- gcrypt=false))
- ])
+AC_MSG_CHECKING(for libgcrypt)
+AM_PATH_LIBGCRYPT(1.2.4, gcrypt=true)
# define the minimal version of libgcrypt required
MHD_GCRYPT_VERSION=1:1.2.4
AC_DEFINE_UNQUOTED([MHD_GCRYPT_VERSION], "$MHD_GCRYPT_VERSION", [gcrypt lib
version])
-AC_SUBST(GCRYPT_LIB_PATH)
-AC_SUBST(GCRYPT_LDFLAGS)
-AC_SUBST(GCRYPT_CPPFLAGS)
# optional: HTTPS support. Enabled by default
Modified: libmicrohttpd/src/daemon/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/Makefile.am 2008-11-20 09:32:19 UTC (rev
7948)
+++ libmicrohttpd/src/daemon/Makefile.am 2008-11-20 09:38:33 UTC (rev
7949)
@@ -5,7 +5,8 @@
-I$(top_srcdir)/src/daemon/https/x509 \
-I$(top_srcdir)/src/daemon/https/minitasn1 \
-I$(top_srcdir)/src/daemon/https/tls \
- -I$(top_srcdir)/src/daemon/https
+ -I$(top_srcdir)/src/daemon/https \
+ @LIBGCRYPT_CFLAGS@
if HAVE_GNU_LD
# If you want to debug with gdb, comment out this line:
Modified: libmicrohttpd/src/daemon/https/lgl/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/https/lgl/Makefile.am 2008-11-20 09:32:19 UTC
(rev 7948)
+++ libmicrohttpd/src/daemon/https/lgl/Makefile.am 2008-11-20 09:38:33 UTC
(rev 7949)
@@ -1,5 +1,5 @@
AM_CPPFLAGS = \
- -I$(top_srcdir)/src/include
+ -I$(top_srcdir)/src/include @LIBGCRYPT_CFLAGS@
if USE_COVERAGE
AM_CFLAGS = -fprofile-arcs -ftest-coverage
@@ -7,8 +7,7 @@
noinst_LTLIBRARIES = liblgl.la
-liblgl_la_LDFLAGS = -lgcrypt
liblgl_la_SOURCES = \
gc-libgcrypt.c \
- gc.h
-
+ gc.h
+liblgl_la_LIBADD = @LIBGCRYPT_LIBS@
Modified: libmicrohttpd/src/daemon/https/tls/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/https/tls/Makefile.am 2008-11-20 09:32:19 UTC
(rev 7948)
+++ libmicrohttpd/src/daemon/https/tls/Makefile.am 2008-11-20 09:38:33 UTC
(rev 7949)
@@ -5,7 +5,8 @@
-I$(top_srcdir)/src/daemon/https/tls \
-I$(top_srcdir)/src/daemon/https/lgl \
-I$(top_srcdir)/src/daemon/https/minitasn1 \
--I$(top_srcdir)/src/daemon/https/x509
+-I$(top_srcdir)/src/daemon/https/x509 \
+ @LIBGCRYPT_CFLAGS@
if USE_COVERAGE
AM_CFLAGS = -fprofile-arcs -ftest-coverage
@@ -13,8 +14,6 @@
noinst_LTLIBRARIES = libtls.la
-libtls_la_LDFLAGS = -lgcrypt
-
libtls_la_SOURCES = \
auth_cert.c \
auth_dhe.c \
@@ -94,4 +93,6 @@
gnutls_str.h \
gnutls_supplemental.h \
gnutls_x509.h \
-x509_b64.h
+x509_b64.h
+libtls_la_LIBADD = @LIBGCRYPT_LIBS@
+
Modified: libmicrohttpd/src/daemon/https/x509/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/https/x509/Makefile.am 2008-11-20 09:32:19 UTC
(rev 7948)
+++ libmicrohttpd/src/daemon/https/x509/Makefile.am 2008-11-20 09:38:33 UTC
(rev 7949)
@@ -4,12 +4,11 @@
-I$(top_srcdir)/src/daemon/https/minitasn1 \
-I$(top_srcdir)/src/daemon/https/lgl \
-I$(top_srcdir)/src/daemon/https/tls \
- -I$(top_srcdir)/src/daemon/https/x509
+ -I$(top_srcdir)/src/daemon/https/x509 \
+ @LIBGCRYPT_CFLAGS@
noinst_LTLIBRARIES = libx509.la
-libx509_la_LDFLAGS = -lgcrypt
-
if USE_COVERAGE
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
@@ -21,4 +20,5 @@
mpi.c mpi.h \
x509_privkey.c privkey.h \
x509.c x509.h
+libx509_la_LIBADD = @LIBGCRYPT_LIBS@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7949 - in libmicrohttpd: . src/daemon src/daemon/https/lgl src/daemon/https/tls src/daemon/https/x509,
gnunet <=