From 92b354d3cea0a501d5c533262986e652d6a81f5f Mon Sep 17 00:00:00 2001
From: jpbl <jpbl>
Date: Wed, 9 Nov 2005 21:07:01 +0000
Subject: [PATCH] *** empty log message ***
---
configure.ac | 36 ++++++++++++++++++------------------
deps/Makefile.am | 10 +---------
2 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7445528caf..bde28e075f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,25 +87,25 @@ dnl compile_ccrtp=yes
dnl AC_CONFIG_SUBDIRS(deps/ccrtp-1.3.5)
dnl libccrtp1_LIBS='${top_srcdir}/deps/ccrtp-1.3.5/src/libccrtp1.la'
dnl ])
-AC_MSG_CHECKING([need to compile libccrtp1])
-AC_ARG_ENABLE(libccrtp1-compilation,
-[ --enable-libccrtp1-compilation Enable libccrtp1 compilation [default=yes]],
-[
- echo "with $enableval"
-if test x$compile_ccrtp = xyes -a ; then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_ERROR([*** You don't have a detectable libccrtp1 distribution enabled and you disabled the libccrtp1 compilation.])
-fi
-],
-[
- echo "without $enableval"
-AC_MSG_RESULT(yes)
-CXXFLAGS="$CXXFLAGS -W -Wall"
-]
-)
+dnl AC_MSG_CHECKING([need to compile libccrtp1])
+dnl AC_ARG_ENABLE(libccrtp1-compilation,
+dnl [ --enable-libccrtp1-compilation Enable libccrtp1 compilation [default=yes]],
+dnl [
+dnl echo "with $enableval"
+dnl if test x$compile_ccrtp = xyes -a ; then
+dnl AC_MSG_RESULT(yes)
+dnl else
+dnl AC_MSG_ERROR([*** You don't have a detectable libccrtp1 distribution enabled and you disabled the libccrtp1 compilation.])
+dnl fi
+dnl ],
+dnl [
+dnl echo "without $enableval"
+dnl AC_MSG_RESULT(yes)
+dnl CXXFLAGS="$CXXFLAGS -W -Wall"
+dnl ]
+dnl )
+dnl AM_CONDITIONAL(COMPILE_CCRTP, test x$compile_ccrtp = xyes)
-AM_CONDITIONAL(COMPILE_CCRTP, test x$compile_ccrtp = xyes)
SFLPHONE_CXXFLAGS="$SFLPHONE_CXXFLAGS $libccrtp1_CFLAGS"
SFLPHONE_LIBS="$SFLPHONE_LIBS $libccrtp1_LIBS"
diff --git a/deps/Makefile.am b/deps/Makefile.am
index be2de0e52a..b9b47071d6 100644
--- a/deps/Makefile.am
+++ b/deps/Makefile.am
@@ -1,11 +1,3 @@
-if COMPILE_CCRTP
-CCRTP = ccrtp-1.3.5
-endif
-
-if COMPILE_COMMONCPP2
-COMMONCPP2 = commoncpp2-1.3.21
-endif
-
if COMPILE_EXOSIP
EXOSIP = libeXosip2-1.9.1-pre17
endif
@@ -18,5 +10,5 @@ if COMPILE_PORTAUDIO
PORTAUDIO = portaudio
endif
-SUBDIRS = $(CCRTP) $(OSIP) $(EXOSIP) $(PORTAUDIO)
+SUBDIRS = $(OSIP) $(EXOSIP) $(PORTAUDIO)
--
GitLab