[ekiga] Remove code made useless by clutter use



commit edc1e5c0b3e2b03f4f21c528ca7dbb4abff488e3
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Mon Feb 3 22:26:42 2014 +0100

    Remove code made useless by clutter use

 configure.ac        |   45 --
 lib/Makefile.am     |   19 -
 lib/gui/xwindow.cpp | 1183 ---------------------------------------------------
 lib/gui/xwindow.h   |  311 --------------
 src/Makefile.am     |    4 -
 5 files changed, 0 insertions(+), 1562 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3775f9f..35c05f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,25 +121,6 @@ AC_MSG_RESULT([yes])
 
 AM_CONDITIONAL(WIN32, test "x${win32}" = "x1")
 
-dnl Check the byte order
-AC_MSG_CHECKING(Byte order)
-byte_order="unknown"
-AC_ARG_WITH([endianess],
-            [AS_HELP_STRING([--with-endianess=big|little],[endianess of target system])],
-           [byte_order="$withval endian"],
-            [AC_C_BIGENDIAN([byte_order="big endian"], [byte_order="little endian"], [])])
-
-if test "x$byte_order" = "xbig endian"; then
-    AC_DEFINE(WORDS_BIGENDIAN,1,[Big Endian Architecture])
-else
-    if test "x$byte_order" = "xlittle endian"; then
-       AC_DEFINE(WORDS_LITTLEENDIAN,1,[Little Endian Architecture])
-    else
-      AC_MSG_ERROR([Unable to detect endianess of target system - please specify])
-    fi
-fi
-
-AC_MSG_RESULT([$byte_order])
 
 
 dnl ###############################
@@ -376,30 +357,6 @@ fi
 AM_CONDITIONAL(USE_MMX, test "x$use_mmx_asm" = "xyes")
 
 
-
-dnl ###############################
-dnl Checks for Shared Memory extension
-dnl ###############################
-SHM="disabled"
-
-if test "x${gm_platform}" = "xlinux" ; then
-  AC_ARG_ENABLE(shm, AS_HELP_STRING([--enable-shm],[enable SHM support (default is enabled)]),
-[if test "x$enableval" = "xyes"; then
-  enable_shm=yes
-fi],enable_shm=yes)
-  if test "x$enable_shm" = "xyes"; then
-    AC_CHECK_LIB(Xext, XShmAttach, with_shm="yes", with_shm="no")
-    if test "x${with_shm}" != "xno"; then
-      SHM="enabled"
-      AC_DEFINE(HAVE_SHM,1,[SHM Support])
-      SHM_LIBS="-lXext"
-      AC_SUBST(SHM_LIBS)
-    fi
-  fi
-fi
-AM_CONDITIONAL(HAVE_SHM, test "x$SHM" = "xenabled")
-
-
 dnl ###############################
 dnl   DBUS Support
 dnl ###############################
@@ -867,8 +824,6 @@ echo "             Video4Linux support  :  $VIDEO4LINUX"
 fi
 echo "                    LDAP support  :  $LDAP"
 echo ""
-echo "           Shared Memory support  :  $SHM"
-echo ""
 if test "x${gm_platform}" != "xmingw" ; then
 echo "                    DBUS support  :  $DBUS"
 echo "            DBUS service support  :  $DBUS_SERVICE"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cc64ba3..651f6b6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,10 +3,6 @@ stacklib_dir = $(stacklibdir)
 
 libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
 
-if !WIN32
-libekiga_la_LDFLAGS += -lX11
-endif
-
 CLEANFILES =
 
 AM_CPPFLAGS = \
@@ -152,12 +148,6 @@ libekiga_la_SOURCES += \
        gui/gm-smiley-chooser-button.c \
        gui/gm-smiley-chooser-button.h
 
-if !WIN32
-libekiga_la_SOURCES += \
-       gui/xwindow.cpp \
-       gui/xwindow.h
-endif
-
 ##
 # Sources of the main engine code
 ##
@@ -602,15 +592,6 @@ engine/components/hal-dbus/hal-marshal.c: engine/components/hal-dbus/hal-marshal
 endif
 
 ##
-# Support for shared memory
-##
-if HAVE_SHM
-
-libekiga_la_LDFLAGS += $(SHM_LIBS)
-
-endif
-
-##
 # Sources of the Clutter video output component
 ##
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 3a955bf..19f2c13 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -121,10 +121,6 @@ AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOO
 ekiga_LDADD = \
        $(top_builddir)/lib/libekiga.la $(AM_LIBS)
 
-if !WIN32
-ekiga_LDFLAGS = -lX11
-endif
-
 EXTRA_DIST = \
        $(service_in_files)             \
        dbus-helper/dbus-stub.xml       \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]