Remove useless include of empathy-contact-factory.h

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a42b76b4753fbc8aaacb35069a86971c4637f77d..c3926fdb20aafd2c0e56dc71472ff154cd6323a7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,6 @@ AC_SUBST(LIBEMPATHY_GTK_REVISION)
 GLIB_REQUIRED=2.16.0
 GTK_REQUIRED=2.16.0
 GCONF_REQUIRED=1.2.0
-LIBGLADE_REQUIRED=2.0.0
 LIBPANELAPPLET_REQUIRED=2.10.0
 TELEPATHY_GLIB_REQUIRED=0.7.23
 MISSION_CONTROL_REQUIRED=4.61
@@ -37,11 +36,8 @@ ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4
 LIBCANBERRA_GTK_REQUIRED=0.4
 
-# Uncomment that to build with deprecated symbols disabled
-#AC_DEFINE(G_DISABLE_DEPRECATED, [], [Disable deprecated GLib symbols])
-#AC_DEFINE(GDK_PIXBUF_DISABLE_DEPRECATED, [], [Disable deprecated GDK pixbuf symbols])
-#AC_DEFINE(GDK_DISABLE_DEPRECATED, [], [Disable deprecated GDK symbols])
-#AC_DEFINE(GTK_DISABLE_DEPRECATED, [], [Disable deprecated GTK symbols])
+# Use --enable-maintainer-mode to disabled deprecated symbols
+GNOME_MAINTAINER_MODE_DEFINES
 
 # Uncomment that to build with single include disabled
 #AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
@@ -56,7 +52,6 @@ AC_CONFIG_AUX_DIR(.)
 GNOME_COMMON_INIT
 
 AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define -Wno-portability)
-AM_MAINTAINER_MODE
 AC_ISC_POSIX
 AC_PROG_CC
 AC_HEADER_STDC
@@ -107,7 +102,6 @@ PKG_CHECK_MODULES(LIBEMPATHYGTK,
    x11
    gtk+-2.0 >= $GTK_REQUIRED
    libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED
-   libglade-2.0 >= $LIBGLADE_REQUIRED
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    telepathy-farsight
@@ -124,7 +118,6 @@ PKG_CHECK_MODULES(EMPATHY,
    x11
    gtk+-2.0 >= $GTK_REQUIRED
    libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED
-   libglade-2.0 >= $LIBGLADE_REQUIRED
    libebook-1.2
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
@@ -210,7 +203,6 @@ if test "x$enable_megaphone" != "xno"; then
       glib-2.0 >= $GLIB_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
       gconf-2.0 >= $GCONF_REQUIRED
-      libglade-2.0 >= $LIBGLADE_REQUIRED 
       libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    ], have_megaphone="yes", have_megaphone="no")
 else
@@ -238,7 +230,6 @@ if test "x$enable_nothere" != "xno"; then
       glib-2.0 >= $GLIB_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
       gconf-2.0 >= $GCONF_REQUIRED
-      libglade-2.0 >= $LIBGLADE_REQUIRED 
       libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    ], have_nothere="yes", have_nothere="no")
 else
@@ -292,7 +283,6 @@ if test "x$enable_python" != "xno"; then
       libxml-2.0
       libmissioncontrol >= $MISSION_CONTROL_REQUIRED
       gtk+-2.0 >= $GTK_REQUIRED
-      libglade-2.0 >= $LIBGLADE_REQUIRED
       gstreamer-0.10
       gstreamer-interfaces-0.10
       telepathy-farsight