r2814 - in trunk/libminisip: . m4

[mikma at minisip.org]

Author: mikma
Date: 2006-10-03 16:54:14 +0200 (Tue, 03 Oct 2006)
New Revision: 2814

Added:
   trunk/libminisip/m4/libzrtpcpp.m4
Modified:
   trunk/libminisip/configure.ac
   trunk/libminisip/m4/Makefile.am
Log:
Copy libzrtpcpp/m4/libzrtpcpp.m4 to libminisip/m4/libzrtpcpp.m4,
required if we don't want libminisip bootstrap depend on libzrtpcpp.
Enable AM_MINISIP_CHECK_LIBZRTPCPP in libminisip configure.ac.



Modified: trunk/libminisip/configure.ac
===================================================================
--- trunk/libminisip/configure.ac	2006-10-02 13:02:55 UTC (rev 2813)
+++ trunk/libminisip/configure.ac	2006-10-03 14:54:14 UTC (rev 2814)
@@ -483,11 +483,10 @@
 AM_MINISIP_CHECK_LIBMSIP([0.3.1])
 AM_MINISIP_CHECK_LIBMIKEY([0.4.1])
 
-dnl NOTE: Disabled check of ZRTP since it breaks trunk
-dnl if test "${enable_zrtp}" = "yes"
-dnl then
-dnl AM_MINISIP_CHECK_LIBZRTPCPP([0.9.0])
-dnl fi
+if test "${enable_zrtp}" = "yes"
+then
+AM_MINISIP_CHECK_LIBZRTPCPP([0.9.0])
+fi
 
 AM_MINISIP_CHECK_COMPLETE
 

Modified: trunk/libminisip/m4/Makefile.am
===================================================================
--- trunk/libminisip/m4/Makefile.am	2006-10-02 13:02:55 UTC (rev 2813)
+++ trunk/libminisip/m4/Makefile.am	2006-10-03 14:54:14 UTC (rev 2814)
@@ -1,6 +1,6 @@
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = @PACKAGE at .m4
-EXTRA_DIST = @PACKAGE at .m4
+EXTRA_DIST = @PACKAGE at .m4 libzrtpcpp.m4
 
 MAINTAINERCLEANFILES = \
 		$(srcdir)/Makefile.in

Copied: trunk/libminisip/m4/libzrtpcpp.m4 (from rev 2813, trunk/libzrtpcpp/m4/libzrtpcpp.m4)