From a3b9a404a924fa290a739bb4c0819b28f250056f Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Mon, 4 Mar 2013 17:13:37 +0000
Subject: [PATCH 1/3] Correct spelling in comment
---
libs/libzrtp/configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/libzrtp/configure.in b/libs/libzrtp/configure.in
index f6001d7515..ebd1609b42 100644
--- a/libs/libzrtp/configure.in
+++ b/libs/libzrtp/configure.in
@@ -93,5 +93,5 @@ AM_CONDITIONAL([HAVE_DOXYGEN],
[test -n "$DOXYGEN"])AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
#
-# Genearte Makefiles
+# Generate Makefiles
AC_OUTPUT([Makefile])
From 9d953e29736725cb75ff90eaeaffa3d2a3227bc1 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Mon, 4 Mar 2013 17:14:12 +0000
Subject: [PATCH 2/3] Cleanup whitespace
---
libs/libzrtp/configure.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/libzrtp/configure.in b/libs/libzrtp/configure.in
index ebd1609b42..7038210c66 100644
--- a/libs/libzrtp/configure.in
+++ b/libs/libzrtp/configure.in
@@ -89,8 +89,8 @@ if test -z "$DOXYGEN";
then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
fi
-AM_CONDITIONAL([HAVE_DOXYGEN],
-[test -n "$DOXYGEN"])AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
+AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
+AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
#
# Generate Makefiles
From ce365948f4e357f159c5be009c8699403f12cdaf Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Mon, 4 Mar 2013 17:22:24 +0000
Subject: [PATCH 3/3] Avoid using AM_CONF_IF
Apparently this is a fairly recent feature of automake and is not
present on at least CentOS5.
---
libs/libzrtp/configure.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libs/libzrtp/configure.in b/libs/libzrtp/configure.in
index 7038210c66..963a95dd71 100644
--- a/libs/libzrtp/configure.in
+++ b/libs/libzrtp/configure.in
@@ -89,8 +89,10 @@ if test -z "$DOXYGEN";
then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
fi
-AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
-AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
+if test -n "$DOXYGEN"; then
+ AM_CONDITIONAL([HAVE_DOXYGEN], [true])
+ AC_CONFIG_FILES([doc/Doxyfile])
+fi
#
# Generate Makefiles