From d49506881a9add1eecb4642c341e25a656395bc7 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Thu, 13 Oct 2011 09:19:49 +0200
Subject: [PATCH] Add config.h of zrtpcpp (cmake no more required)

---
 README                                        |  2 +-
 prepare_sources.sh                            |  4 +-
 .../externals/build/libzrtpcpp/Android.mk     |  5 +-
 .../externals/build/libzrtpcpp/config.h       | 53 +++++++++++++++++++
 4 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 submodules/externals/build/libzrtpcpp/config.h

diff --git a/README b/README
index d44a69955..159a833c5 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@
 
 To build liblinphone for Android, you must:
 1) download the Android ndk (>=r5c) from google.
-2) install the autotools: autoconf, automake, aclocal, libtoolize and cmake
+2) install the autotools: autoconf, automake, aclocal, libtoolize
 3) run the ./prepare_sources.sh script in the top level directory. This will download iLBC source files and convert some assembly files in VP8 project.
 
 	$ ./prepare_sources.sh
diff --git a/prepare_sources.sh b/prepare_sources.sh
index 86c0cd8fa..93ecd83c8 100755
--- a/prepare_sources.sh
+++ b/prepare_sources.sh
@@ -14,5 +14,5 @@ cd submodules/libilbc-rfc3951 && ./autogen.sh && ./configure && make || ( echo "
 
 cd $topdir/submodules/externals/build/libvpx && ./asm_conversion.sh && cp *.asm *.h ../../libvpx/ || ( echo "VP8 prepare stage failed." ; exit 1 )
 
-echo Preparing ZRTP (need cmake installed)
-cmake  -Denable-ccrtp=false submodules/externals/libzrtpcpp
+# As a memo, the config.h for zrtpcpp is generated using the command
+# cmake  -Denable-ccrtp=false submodules/externals/libzrtpcpp
diff --git a/submodules/externals/build/libzrtpcpp/Android.mk b/submodules/externals/build/libzrtpcpp/Android.mk
index cac26625e..57c218276 100644
--- a/submodules/externals/build/libzrtpcpp/Android.mk
+++ b/submodules/externals/build/libzrtpcpp/Android.mk
@@ -1,5 +1,5 @@
-
-LOCAL_EXTERNALS:= $(call my-dir)/../..
+MK_DIR:=$(call my-dir)
+LOCAL_EXTERNALS:= $(MK_DIR)/../..
 LOCAL_PATH:= $(LOCAL_EXTERNALS:=)/libzrtpcpp
 include $(CLEAR_VARS)
 
@@ -58,6 +58,7 @@ LOCAL_SRC_FILES += \
 LOCAL_CFLAGS := -D__EXPORT=""
 
 LOCAL_C_INCLUDES += \
+	$(MK_DIR)/ \
 	$(LOCAL_PATH)/src/ \
 	$(LOCAL_EXTERNALS)/openssl \
         $(LOCAL_EXTERNALS)/openssl/include 
diff --git a/submodules/externals/build/libzrtpcpp/config.h b/submodules/externals/build/libzrtpcpp/config.h
new file mode 100644
index 000000000..191321486
--- /dev/null
+++ b/submodules/externals/build/libzrtpcpp/config.h
@@ -0,0 +1,53 @@
+
+/* Define to 1 if you have the <gcrypt.h> header file. */
+/* #undef HAVE_GCRYPT_H */
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+/* #undef HAVE_LIBPTHREAD */
+
+/* Define to 1 if you have the <openssl/aes.h> header file. */
+#define  HAVE_OPENSSL_AES_H 1
+
+/* Define to 1 if you have the <openssl/bn.h> header file. */
+#define  HAVE_OPENSSL_BN_H 1
+
+/* Define to 1 if you have the <openssl/sha.h> header file. */
+#define  HAVE_OPENSSL_SHA_H 1
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#define  HAVE_PTHREAD_H 1
+
+/* Name of package */
+#define PACKAGE libzrtpcpp
+
+/* Version number of package */
+#define  VERSION 2.1.0
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to rpl_malloc if the replacement function should be used. */
+#undef malloc
+
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#undef restrict
+/* Work around a bug in Sun C++: it does not support _Restrict, even
+   though the corresponding Sun C compiler does, which causes
+   "#define restrict _Restrict" in the previous line.  Perhaps some future
+   version of Sun C++ will work with _Restrict; if so, it'll probably
+   define __RESTRICT, just as Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+#endif
+
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+   code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile