[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/9] configure: add check for libgcrypt
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 7/9] configure: add check for libgcrypt |
Date: |
Fri, 6 Feb 2009 19:08:58 -0200 |
Signed-off-by: Eduardo Habkost <address@hidden>
---
Makefile | 6 ++++++
Makefile.target | 5 +++++
configure | 37 +++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 98f67b1..f634d1a 100644
--- a/Makefile
+++ b/Makefile
@@ -162,6 +162,12 @@ tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o
OBJS+=$(addprefix slirp/, $(SLIRP_OBJS))
endif
+ifdef CONFIG_GCRYPT
+CFLAGS += $(CONFIG_GCRYPT_CFLAGS)
+LIBS += $(CONFIG_GCRYPT_LIBS)
+endif
+
+
LIBS+=$(VDE_LIBS)
cocoa.o: cocoa.m
diff --git a/Makefile.target b/Makefile.target
index 28ba17f..f6182fe 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -554,6 +554,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
LIBS += $(CONFIG_VNC_TLS_LIBS)
endif
+ifdef CONFIG_GCRYPT
+CPPFLAGS += $(CONFIG_GCRYPT_CFLAGS)
+LIBS += $(CONFIG_GCRYPT_LIBS)
+endif
+
ifdef CONFIG_BLUEZ
LIBS += $(CONFIG_BLUEZ_LIBS)
endif
diff --git a/configure b/configure
index d2aa783..d38d99e 100755
--- a/configure
+++ b/configure
@@ -164,6 +164,7 @@ fmod_lib=""
fmod_inc=""
oss_lib=""
vnc_tls="yes"
+libgcrypt="yes"
qcow_aes="yes"
vnc_des="yes"
bsd="no"
@@ -389,6 +390,8 @@ for opt do
;;
--disable-vnc-tls) vnc_tls="no"
;;
+ --disable-gcrypt) libgcrypt="no"
+ ;;
--disable-qcow-aes) qcow_aes="no"
;;
--disable-vnc-des) vnc_des="no"
@@ -550,6 +553,7 @@ echo " Available cards:
$audio_possible_cards"
echo " --enable-mixemu enable mixer emulation"
echo " --disable-brlapi disable BrlAPI"
echo " --disable-vnc-tls disable TLS encryption for VNC server"
+echo " --disable-gcrypt disable libgcrypt usage"
echo " --disable-qcow-aes disable AES encrypton support on qcow"
echo " --disable-vnc-des disable VNC DES-challenge authentication"
echo " --disable-curses disable curses output"
@@ -831,6 +835,28 @@ EOF
fi
##########################################
+# libgcrypt detection
+if test "$libgcrypt" = "yes" ; then
+cat > $TMPC <<EOF
+#include <gcrypt.h>
+int main(void) {
+ gcry_cipher_hd_t ci;
+ gcry_error_t e = gcry_cipher_open(&ci, GCRY_CIPHER_DES,
GCRY_CIPHER_MODE_ECB, 0);
+ return 0;
+}
+EOF
+ libgcrypt_cflags=`libgcrypt-config --cflags 2> /dev/null`
+ libgcrypt_libs=`libgcrypt-config --libs 2> /dev/null`
+ if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $libgcrypt_cflags $TMPC \
+ $libgcrypt_libs > /dev/null 2> /dev/null ; then
+ :
+ else
+ libgcrypt="no"
+ fi
+fi
+
+
+##########################################
# vde libraries probe
if test "$vde" = "yes" ; then
cat > $TMPC << EOF
@@ -1133,6 +1159,11 @@ echo "mingw32 support $mingw32"
echo "Audio drivers $audio_drv_list"
echo "Extra audio cards $audio_card_list"
echo "Mixer emulation $mixemu"
+echo "libgcrypt support $libgcrypt"
+if test "$libgcrypt" = "yes" ; then
+ echo " gcrypt CFLAGS $libgcrypt_cflags"
+ echo " gcrypt LIBS $libgcrypt_libs"
+fi
echo "VNC TLS support $vnc_tls"
if test "$vnc_tls" = "yes" ; then
echo " TLS CFLAGS $vnc_tls_cflags"
@@ -1385,6 +1416,12 @@ if [ "$vnc_des" = "yes" ];then
echo "CONFIG_VNC_DES=yes" >> $config_mak
echo "#define CONFIG_VNC_DES 1" >> $config_h
fi
+if test "$libgcrypt" = "yes" ; then
+ echo "CONFIG_GCRYPT=yes" >> $config_mak
+ echo "CONFIG_GCRYPT_CFLAGS=$libgcrypt_cflags" >> $config_mak
+ echo "CONFIG_GCRYPT_LIBS=$libgcrypt_libs" >> $config_mak
+ echo "#define CONFIG_GCRYPT 1" >> $config_h
+fi
if [ "$qcow_aes" = "yes" ];then
echo "#define CONFIG_QCOW_AES 1" >> $config_h
fi
--
1.6.0.2.GIT
- [Qemu-devel] [PATCH 0/9] encryption code changes, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 6/9] vnc: make DES-challenge authentication (aka "VNC auth") optional, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 2/9] drive_init: Don't try to read passwords before monitor setup, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 7/9] configure: add check for libgcrypt,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 4/9] qcow: define QCOW_CRYPT_MAX, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 3/9] monitor_readline: poll pending bottom halves before readline_start(), Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 5/9] qcow: make encryption support optional, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 1/9] vnc: abort on unknown options, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 8/9] qcow: use libgcrypt AES implementation, Eduardo Habkost, 2009/02/06
- [Qemu-devel] [PATCH 9/9] vnc: use libgcrypt for DES-challenge authentication, Eduardo Habkost, 2009/02/06
- [Qemu-devel] Re: [PATCH 0/9] encryption code changes, Jan Kiszka, 2009/02/06
- Re: [Qemu-devel] [PATCH 0/9] encryption code changes, Anthony Liguori, 2009/02/06