[Pkg-voip-commits] r841 - in twinkle/trunk: . debian

[Mark Purcell]

Author: msp
Date: 2005-10-12 20:48:55 +0000 (Wed, 12 Oct 2005)
New Revision: 841

Modified:
   twinkle/trunk/configure.in
   twinkle/trunk/debian/changelog
Log:
* (NOT RELEASED YET) New upstream release

Modified: twinkle/trunk/configure.in
===================================================================
--- twinkle/trunk/configure.in	2005-10-12 20:22:12 UTC (rev 840)
+++ twinkle/trunk/configure.in	2005-10-12 20:48:55 UTC (rev 841)
@@ -1,3 +1,4 @@
+<<<<<<< .working
 AC_INIT(src/phone.h)
 AM_CONFIG_HEADER(src/twinkle_config.h)
 
@@ -69,3 +70,111 @@
 	src/audits/Makefile src/sdp/Makefile src/parser/Makefile \
 	src/sockets/Makefile src/stun/Makefile src/threads/Makefile \
 	twinkle.spec)
+=======
+AC_INIT(src/phone.h)
+AM_CONFIG_HEADER(src/twinkle_config.h)
+
+AC_ARG_ENABLE(qt-check, 
+	AC_HELP_STRING([--disable-qt-check], [don't check Qt installation]),
+	[ac_cv_qt_check=$enableval], [ac_cv_qt_check=yes])
+
+AM_INIT_AUTOMAKE(twinkle,0.3)
+AC_DEFINE(VERSION_DATE,["October 10 2005"],[Version release date])
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_CPP
+AC_PROG_CXXCPP
+AC_PROG_RANLIB
+AC_PROG_LEX
+AC_PROG_YACC
+
+AC_CHECK_HEADERS([])
+
+# Check version of the Common C++ library.
+# This also sets the cc++2 include directory in CXXFLAGS
+OST_CCXX2_VERSION(1.3.0,,exit)
+
+# Temporarily add some default directories to PKG_CONFIG_PATH such that
+# the user will not be burdened with setting PKG_CONFIG_PATH
+OLD_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+
+if test "x${prefix}" != "xNONE"
+then
+	PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${prefix}/lib/pkgconfig
+fi
+
+if test -n "$QTDIR"
+then
+	PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/lib/pkgconfig
+fi
+
+export PKG_CONFIG_PATH
+
+PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.3.4)
+
+if test x$ac_cv_qt_check = xyes
+then
+	PKG_CHECK_MODULES(QT, qt-mt >= 3.3.0)
+fi
+
+# Restore the original value of PKG_CONFIG_PATH
+PKG_CONFIG_PATH=$OLD_PKG_CONFIG_PATH
+export PKG_CONFIG_PATH
+
+# Check if QTDIR variable is set
+AC_MSG_CHECKING([value of \$QTDIR])
+if test -n "$QTDIR"
+then
+	AC_MSG_RESULT([$QTDIR])
+else
+	AC_MSG_RESULT([not set])
+	AC_MSG_ERROR([Set \$QTDIR to the Qt directory, eg. /usr/lib/qt3])
+fi
+
+# Create a Qt include project file for platform dependend variables
+# This file will be included by the project file in the gui directory
+# Determine include files and dynamic libs.
+QT_INCL_PRO=qtccxxincl.pro
+AC_MSG_NOTICE([creating $QT_INCL_PRO (include project file for Qt)])
+echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
+echo "LIBS += `$CCGNU2_CONFIG --stdlibs`" >> $QT_INCL_PRO
+echo "LIBS += $CCRTP_LIBS" >> $QT_INCL_PRO
+
+# Check if KDE is available
+AC_CHECK_PROG(have_kde, kde-config, yes, no)
+if test x$have_kde = xyes
+then
+	TWINKLE_KDE_PREFIX=`kde-config --prefix`
+	AC_CHECK_FILES(${TWINKLE_KDE_PREFIX}/include/kde/kapplication.h
+		${TWINKLE_KDE_PREFIX}/include/kde/kcmdlineargs.h
+		${TWINKLE_KDE_PREFIX}/include/kde/ksystemtray.h
+		${TWINKLE_KDE_PREFIX}/include/kde/kpassivepopup.h,
+		[], 
+		[AC_MSG_ERROR([kde header files missing (kdelibs3-devel package)])])
+	AC_DEFINE(HAVE_KDE, 1, [Define to 1 if you have KDE.])
+	echo "INCLUDEPATH += ${TWINKLE_KDE_PREFIX}/include/kde" >> $QT_INCL_PRO
+	echo "LIBS += -L${TWINKLE_KDE_PREFIX}/lib -lkdecore -lkdeui" >> $QT_INCL_PRO
+fi
+
+# Check if ALSA is available
+AC_CHECK_LIB(asound, main, [
+	AC_CHECK_HEADER(alsa/asoundlib.h, [],
+		[AC_MSG_ERROR([alsa header files missing (alsa-devel package)])])
+	AC_DEFINE(HAVE_LIBASOUND, 1, [Define to 1 if you have the <libasound> library.])
+	LIBS="-lasound $LIBS"
+	echo "LIBS += -lasound" >> $QT_INCL_PRO
+	])
+
+$QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
+echo "distdir:" >> src/gui/Makefile
+
+# Strip the -O2 flag from CXXFLAGS for building the SIP parser.
+# g++ cannot compile the generated C code from bison with -O2
+PARSER_CXXFLAGS=`echo $CXXFLAGS | sed -e s/\-O2//`
+AC_SUBST(PARSER_CXXFLAGS)
+
+AC_OUTPUT(Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile \
+	src/audits/Makefile src/sdp/Makefile src/parser/Makefile \
+	src/sockets/Makefile src/stun/Makefile src/threads/Makefile \
+	twinkle.spec)

Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog	2005-10-12 20:22:12 UTC (rev 840)
+++ twinkle/trunk/debian/changelog	2005-10-12 20:48:55 UTC (rev 841)
@@ -1,3 +1,9 @@
+twinkle (0.3-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+
+ -- Mark Purcell <msp at debian.org>  Wed, 12 Oct 2005 21:22:28 +0100
+
 twinkle (0.2.1-3) UNRELEASED; urgency=low
 
   * Debian VoIP upload