Paste code

diff --git a/src/Makefile.am b/src/Makefile.am
index 48d766b..a98b26d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ AM_LDFLAGS = -L $(libdir)
 
 AM_CPPFLAGS = -Wall $(CCRTP_CFLAGS) $(XML2_CFLAGS) -DDATADIR=\"$(pkgdatadir)\"
 
-noinst_PROGRAMS = twinkle
+bin_PROGRAMS = twinkle
 
 noinst_LIBRARIES = libtwinkle.a
 
@@ -99,4 +99,4 @@ libtwinkle_a_SOURCES =\
         userintf.h\
         util.h
 
-SUBDIRS = audio audits im mwi parser patterns presence sdp sockets stun threads utils . gui gui/lang
+SUBDIRS = audio audits im mwi parser patterns presence sdp sockets stun threads utils .
diff --git a/Makefile.am b/Makefile.am
index 5c3bcac..aad91d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,25 +7,15 @@ ACLOCAL_AMFLAGS = -I m4
 
 pkglangdir = $(pkgdatadir)/lang
 
-bin_SCRIPTS = src/gui/twinkle
-noinst_SCRIPTS = twinkle.desktop
 
 pkgdata_DATA = data/ringback.wav data/ringtone.wav \
- data/providers.csv \
- src/gui/images/twinkle16.png src/gui/images/twinkle32.png \
- src/gui/images/twinkle48.png
+ data/providers.csv
 
-EXTRA_DIST = src/gui/*.ui src/gui/*.h src/gui/*.cpp src/gui/Makefile \
- src/gui/twinkle.pro src/gui/images/* \
- data/ringback.wav data/ringtone.wav data/providers.csv \
- m4/*.m4 \
- sip.protocol twinkle.desktop.in Doxyfile
+EXTRA_DIST = data/ringback.wav data/ringtone.wav data/providers.csv \
+ m4/*.m4 sip.protocol Doxyfile
 
 SUBDIRS = src
 
 edit = sed \
  -e 's,@datadir\@,$(pkgdatadir),g' \
  -e 's,@prefix\@,$(prefix),g'
- 
-twinkle.desktop: Makefile $(srcdir)/twinkle.desktop.in
- $(edit) $(srcdir)/twinkle.desktop.in >twinkle.desktop
diff --git a/configure.in b/configure.in
index 82d8f8d..e977e86 100644
--- a/configure.in
+++ b/configure.in
@@ -2,14 +2,6 @@ AC_INIT(src/phone.h)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(src/twinkle_config.h)
 
-AC_ARG_ENABLE(qt-check, 
- AC_HELP_STRING([--disable-qt-check], [do not check Qt installation]),
- [ac_cv_qt_check=$enableval], [ac_cv_qt_check=yes])
- 
-AC_ARG_WITH(kde,
- AC_HELP_STRING([--without-kde], [do not compile KDE features]),
- [ac_cv_kde=$withval], [ac_cv_kde=yes])
- 
 AC_ARG_WITH(ilbc,
  AC_HELP_STRING([--without-ilbc], [do not compile iLBC]),
  [ac_cv_ilbc=$withval], [ac_cv_ilbc=yes])
@@ -41,9 +33,9 @@ AC_FUNC_STRERROR_R
 
 AC_CHECK_HEADERS([linux/types.h])
 AC_CHECK_HEADERS([linux/errqueue.h],[],[],[
- #if HAVE_LINUX_TYPES_H
- #include <linux/types.h>
- #endif])
+        #if HAVE_LINUX_TYPES_H
+        #include <linux/types.h>
+        #endif])
 
 # Check version of the Common C++ library.
 # This also sets the cc++2 include directory in CXXFLAGS
@@ -69,117 +61,13 @@ export PKG_CONFIG_PATH
 PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
 
 PKG_CHECK_MODULES(XML2, libxml-2.0)
-# AC_CHECK_HEADER(libxml/tree.h, [],
-# [AC_MSG_ERROR([libxml2 header files missing (libxml2-devel package)])])
-
-if test "x$ac_cv_qt_check" = "xyes"
-then
- PKG_CHECK_MODULES(QT, qt-mt >= 3.3.0 qt-mt < 4.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
-
-AC_MSG_CHECKING([for qmake])
-if test -x $QTDIR/bin/qmake
-then
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Cannot find qmake in \$QTDIR/bin. \$QTDIR is incorrect.])
-fi
-
-# Without this macro, compiling on non-kde systems does not work
-AC_PATH_QT
-
-# Check if lrelease is available
-AC_CHECK_PROG(have_lrelease, lrelease, yes, no)
-if test "x$have_lrelease" = "xno"
-then
- AC_MSG_ERROR([lrelease is missing (qt3-devel-tools package)])
-fi
-
-dnl Create a Qt include project file for platform dependend variables
-dnl This file will be included by the project file in the gui directory
-dnl Determine include files and dynamic libs.
-dnl Creation of qtccxxincl.pro is good to be in AC_CONFIG_COMMANDS
-dnl macro so that config.status to be able to create it too.
-dnl In this case we benefit from more ac_xxx variables.
-dnl Disadvantage is autoconf don't group commands with same tag
-dnl and we should use different tags. In result AC_OUTPUT will
-dnl show all of them.
-QT_INCL_PRO=qtccxxincl.pro
-AC_MSG_NOTICE([creating $QT_INCL_PRO (include project file for Qt)])
-
-# first set include path to generated files
-echo "INCLUDEPATH += `pwd`/src" > $QT_INCL_PRO
-# next get includes specified on command line
-(
-set -- $CPPFLAGS
-while test -n "$1"; do
-  echo $1
-  shift
-done
-) | grep '^-I' | sed -e 's|^-I||' | xargs echo INCLUDEPATH += >> $QT_INCL_PRO
-
-#echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
-# libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
-# should include above flags !
-echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO
-echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
-
-# get libraries specified on command line
-echo $LDFLAGS | xargs echo LIBS += >> $QT_INCL_PRO
-
-echo "LIBS += `$CCGNU2_CONFIG --stdlibs`" >> $QT_INCL_PRO
-echo "LIBS += $CCRTP_LIBS" >> $QT_INCL_PRO
-echo "LIBS += $XML2_LIBS" >> $QT_INCL_PRO
-
-# Check if KDE is available
-if test "x$ac_cv_kde" = "xyes"
-then
- AC_CHECK_PROG(have_kde, kde-config, yes, no)
-else
- have_kde="no"
-fi
- 
-if test "x$have_kde" = "xyes"
-then
- KDE_SET_PREFIX
- AC_PATH_KDE
-
- AC_CHECK_FILES(${kde_includes}/kapplication.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 += ${kde_includes}" >> $QT_INCL_PRO
- echo "LIBS += -L${kde_libraries} -lkdecore -lkdeui" >> $QT_INCL_PRO
- echo "LIBS += -L${TWINKLE_KDE_PREFIX}/lib -lkabc" >> $QT_INCL_PRO
-else
- include_x11_FALSE="yes"
- include_ARTS_FALSE="yes"
- AC_PREFIX_DEFAULT(${prefix:-/usr/local})
-fi
 
 # Check for libbbind or libresolv. libbind is preferred as libresolv gives
 # GLIBC_PRIVATE on Fedora.
 AC_CHECK_LIB(bind, main, [
- LIBS="-lbind $LIBS"
- echo "LIBS += -lbind" >> $QT_INCL_PRO],
+ LIBS="-lbind $LIBS"],
  [
- LIBS="-lresolv $LIBS"
- echo "LIBS += -lresolv" >> $QT_INCL_PRO])
+ LIBS="-lresolv $LIBS"])
 
 # Check if sndfile library is available
 AC_CHECK_HEADER(sndfile.h, [],
@@ -207,7 +95,6 @@ AC_CHECK_LIB(magic, magic_open, [],
 # echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
 have_gsm="no"
 GSM_LIBS="\\$(top_builddir)/src/audio/gsm/libgsm.a"
-echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
 
 AC_SUBST(GSM_LIBS)
 
@@ -217,7 +104,6 @@ AC_CHECK_LIB(asound, main, [
   [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
  have_libasound="yes"
  ], [have_libasound="no"])
  
@@ -232,8 +118,6 @@ then
     [AC_MSG_ERROR([speexdsp header files missing])])
    AC_DEFINE(HAVE_SPEEX, 1, [Define to 1 if you have the <speex> library.])
    LIBS="-lspeex -lspeexdsp $LIBS"
-   echo "LIBS += -lspeex" >> $QT_INCL_PRO
-   echo "LIBS += -lspeexdsp" >> $QT_INCL_PRO
    have_speex="yes"
    ], [have_speex="no"])
   ], [have_speex="no"])
@@ -249,7 +133,6 @@ then
    [AC_MSG_ERROR([ilbc header files missing])])
   AC_DEFINE(HAVE_ILBC, 1, [Define to 1 if you have the <ilbc> library.])
   LIBS="-lilbc $LIBS"
-  echo "LIBS += -lilbc" >> $QT_INCL_PRO
   have_ilbc="yes"
   ], [have_ilbc="no"])
   
@@ -270,7 +153,6 @@ then
    [AC_MSG_ERROR([zrtp header files missing])])
   AC_DEFINE(HAVE_ZRTP, 1, [Define to 1 if you have the <libzrtpcpp> library.])
   LIBS="-lzrtpcpp $LIBS"
-  echo "LIBS += -lzrtpcpp" >> $QT_INCL_PRO
   have_zrtp="yes"
   ], [have_zrtp="no"])
 else
@@ -288,36 +170,9 @@ fi
 AC_CHECK_HEADER(pcrecpp.h, [],
  [AC_MSG_ERROR([pcrecpp.h missing (pcre-devel package)])])
 AC_CHECK_LIB(pcrecpp, main, [
- LIBS="-lpcrecpp $LIBS"
- echo "LIBS += -lpcrecpp" >> $QT_INCL_PRO], 
+ LIBS="-lpcrecpp $LIBS"],
  [AC_MSG_ERROR([libpcrecpp library is missing (pcre package).])])
 
-ms_CHECK_LRELEASE()
- 
-dnl $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
-dnl Command above is incorrect because srcdir may differ from builddir
-dnl
-dnl $QTDIR/bin/qmake -o src/gui/Makefile $srcdir/src/gui/twinkle.pro
-dnl Command above although is correct in both cases, i.e. when srcdir
-dnl is equal or differ from builddir will not generate proper Makefile.
-dnl Reason is unknown.
-dnl
-dnl The sed command adds the KDE3 libraries in front of the LIB path.
-dnl This is needed to correctly build on a KDE4 system. Otherwise
-dnl gcc will link against KDE4 libraries.
-AC_CONFIG_COMMANDS([src/gui/Makefile],
- [
- $QTDIR/bin/qmake -o src/gui/Makefile $srcdir/src/gui/twinkle.pro
- echo "distdir:" >> src/gui/Makefile
- echo "check:" >> src/gui/Makefile
- if test "x$ac_cv_kde" = "xyes"
-        then
-  sed -i -e "s|\(LIBS *= \)|\1-L${kde_libraries} |" src/gui/Makefile
- fi
- ],
- [kde_libraries=${kde_libraries}]
-)
-
 dnl Next is useless. See comments in src/parser/Makefile.am .
 dnl # Strip the -O2 flag from CXXFLAGS for building the SIP parser.
 dnl # g++ cannot compile the generated C code from bison with -O2 or -Os
@@ -328,13 +183,12 @@ dnl 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 \
- src/gui/lang/Makefile src/mwi/Makefile src/im/Makefile \
+ src/mwi/Makefile src/im/Makefile \
  src/patterns/Makefile src/utils/Makefile src/presence/Makefile \
  twinkle.spec)
- 
+
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Configured optional components:])
-AC_MSG_RESULT([KDE support: $have_kde])
 AC_MSG_RESULT([ALSA:        $have_libasound])
 AC_MSG_RESULT([Speex:       $have_speex])
 AC_MSG_RESULT([iLBC:        $have_ilbc])