X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=17f58aecdf7e45edc059132918093cac2f88061d;hp=4df19bd120d8423431b2a3c728c709c1bf0aca4a;hb=601e416af2bafa2b890b045139c9d50ed5aa9c65;hpb=c637daaf5750c1809e05ff39fa2070591410aac3

diff --git a/configure.ac b/configure.ac
index 4df19bd1..17f58aec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,29 +1,30 @@
-AC_INIT(Empathy, 2.29.1, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+# Making releases:
+#   set the new version number:
+#     odd minor -> development series
+#     even minor -> stable series
+#     increment micro for each release within a series
+#   set empathy_nano_version to 0.
+
+m4_define([empathy_major_version], [2])
+m4_define([empathy_minor_version], [29])
+m4_define([empathy_micro_version], [1])
+m4_define([empathy_nano_version], [1])
+
+m4_define([empathy_base_version],
+          [empathy_major_version.empathy_minor_version.empathy_micro_version])
+m4_define([empathy_version],
+          [m4_if(empathy_nano_version, 0, [empathy_base_version],
+              [empathy_base_version].[empathy_nano_version])])
+
+AC_INIT(Empathy, empathy_version, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+
+
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
   Copyright (C) 2007-2008 Collabora Ltd.
 ])
 
-# LT Version numbers, remember to change them just *before* a release.
-#   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
-#   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
-#   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=30
-LIBEMPATHY_AGE=0
-LIBEMPATHY_REVISION=0
-
-LIBEMPATHY_GTK_CURRENT=28
-LIBEMPATHY_GTK_AGE=0
-LIBEMPATHY_GTK_REVISION=0
-
-AC_SUBST(LIBEMPATHY_CURRENT)
-AC_SUBST(LIBEMPATHY_AGE)
-AC_SUBST(LIBEMPATHY_REVISION)
-AC_SUBST(LIBEMPATHY_GTK_CURRENT)
-AC_SUBST(LIBEMPATHY_GTK_AGE)
-AC_SUBST(LIBEMPATHY_GTK_REVISION)
-
 # Minimal version required
 GLIB_REQUIRED=2.22.0
 GTK_REQUIRED=2.16.0
@@ -38,7 +39,7 @@ LIBCHAMPLAIN_REQUIRED=0.4
 LIBCHAMPLAIN_GTK_REQUIRED=0.4
 CLUTTER_GTK_REQUIRED=0.10
 GEOCLUE_REQUIRED=0.11
-WEBKIT_REQUIRED=1.1.7
+WEBKIT_REQUIRED=1.1.15
 KEYRING_REQUIRED=2.22
 NETWORK_MANAGER_REQUIRED=0.7.0
 NAUTILUS_SENDTO_REQUIRED=2.28.0.1
@@ -67,7 +68,6 @@ AM_PROG_MKDIR_P
 AM_PATH_GLIB_2_0
 AC_PATH_XTRA
 IT_PROG_INTLTOOL([0.35.0])
-GTK_DOC_CHECK([1.3])
 GNOME_DOC_INIT([0.17.3])
 IDT_COMPILE_WARNINGS
 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
@@ -336,50 +336,25 @@ AC_ARG_ENABLE(moblin,
 
 if test "x$enable_moblin" != "xno"; then
     PKG_CHECK_MODULES(MOBLIN,
-    [nbtk-gtk-1.2], have_nbtk="yes", have_nbtk="no")
+    [
+       nbtk-gtk-1.2
+    ], have_moblin="yes", have_moblin="no")
 
-    if test "x$have_nbtk" = "xyes"; then
-       AC_DEFINE(HAVE_NBTK, 1, [Define if you have nbtk])
+    if test "x$have_moblin" = "xyes"; then
+       AC_DEFINE(HAVE_MOBLIN, 1, [Define if you have moblin])
     fi
 else
-   have_nbtk="no"
+   have_moblin="no"
 fi
 
-if test "x$enable_moblin" = "xyes" -a "x$have_nbtk" != "xyes"; then
+if test "x$enable_moblin" = "xyes" -a "x$have_moblin" != "xyes"; then
    AC_MSG_ERROR([Couldn't find moblin dependencies.])
 fi
 
-AM_CONDITIONAL(HAVE_NBTK, test "x$have_nbtk" = "xyes")
+AM_CONDITIONAL(HAVE_MOBLIN, test "x$have_moblin" = "xyes")
 AC_SUBST(MOBLIN_CFLAGS)
 AC_SUBST(MOBLIN_LIBS)
 
-# -----------------------------------------------------------
-# Megaphone
-# -----------------------------------------------------------
-AC_ARG_ENABLE(megaphone,
-              AS_HELP_STRING([--enable-megaphone=@<:@no/yes/auto@:>@],
-                             [build megaphone applet]), ,
-                             enable_megaphone=auto)
-
-if test "x$enable_megaphone" != "xno"; then
-   PKG_CHECK_MODULES(MEGAPHONE, 
-   [
-      libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED
-      glib-2.0 >= $GLIB_REQUIRED
-      gtk+-2.0 >= $GTK_REQUIRED
-      gconf-2.0 >= $GCONF_REQUIRED
-      telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   ], have_megaphone="yes", have_megaphone="no")
-else
-   have_megaphone=no
-fi
-
-if test "x$enable_megaphone" = "xyes" -a "x$have_megaphone" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find megaphone dependencies.])
-fi
-
-AM_CONDITIONAL(HAVE_MEGAPHONE, test "x$have_megaphone" = "xyes")
-
 # -----------------------------------------------------------
 # nautilus-sendto
 # -----------------------------------------------------------
@@ -403,33 +378,6 @@ fi
 
 AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
 
-# -----------------------------------------------------------
-# Nothere
-# -----------------------------------------------------------
-AC_ARG_ENABLE(nothere,
-              AS_HELP_STRING([--enable-nothere=@<:@no/yes/auto@:>@],
-                             [build nothere applet]), ,
-                             enable_nothere=auto)
-
-if test "x$enable_nothere" != "xno"; then
-   PKG_CHECK_MODULES(NOTHERE, 
-   [
-      libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED
-      glib-2.0 >= $GLIB_REQUIRED
-      gtk+-2.0 >= $GTK_REQUIRED
-      gconf-2.0 >= $GCONF_REQUIRED
-      telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   ], have_nothere="yes", have_nothere="no")
-else
-   have_nothere=no
-fi
-
-if test "x$enable_nothere" = "xyes" -a "x$have_nothere" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find nothere dependencies.])
-fi
-
-AM_CONDITIONAL(HAVE_NOTHERE, test "x$have_nothere" = "xyes")
-
 # -----------------------------------------------------------
 # Tests
 # -----------------------------------------------------------
@@ -453,41 +401,6 @@ fi
 
 AM_CONDITIONAL(HAVE_TESTS, test "x$have_check" = "xyes")
 
-# -----------------------------------------------------------
-# Python Bindings
-# -----------------------------------------------------------
-AC_ARG_ENABLE(python,
-              AS_HELP_STRING([--enable-python=@<:@no/yes/auto@:>@],
-                             [build python bindings to libempathy and libempathy-gtk]), ,
-                             enable_python=auto)
-
-if test "x$enable_python" != "xno"; then
-   PKG_CHECK_MODULES(PYTHON_BINDING,
-   [
-      pygtk-2.0,
-      glib-2.0 >= $GLIB_REQUIRED
-      gobject-2.0
-      gconf-2.0 >= $GCONF_REQUIRED
-      libxml-2.0
-      gtk+-2.0 >= $GTK_REQUIRED
-      gstreamer-0.10
-      gstreamer-interfaces-0.10
-      telepathy-farsight
-   ], have_python="yes", have_python="no")
-   if test "x$have_python" = "xyes" ; then
-      AM_CHECK_PYTHON_HEADERS(,have_python="no")
-      AC_CHECK_PROGS([PYGOBJECTCODEGEN], [pygobject-codegen-2.0 pygtk-codegen-2.0])
-   fi
-else
-   have_python=no
-fi
-
-if test "x$enable_python" = "xyes" -a "x$have_python" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find python.])
-fi
-
-AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
-
 # -----------------------------------------------------------
 # Coding style checks
 # -----------------------------------------------------------
@@ -509,26 +422,10 @@ AC_OUTPUT([
    extensions/Makefile
    po/Makefile.in
    libempathy/Makefile
-   libempathy/libempathy.pc
    libempathy-gtk/Makefile
-   libempathy-gtk/libempathy-gtk.pc
    src/Makefile
-   megaphone/Makefile
-   megaphone/src/Makefile
-   megaphone/data/Makefile
    nautilus-sendto-plugin/Makefile
-   nothere/Makefile
-   nothere/src/Makefile
-   nothere/data/Makefile
-   docs/Makefile
-   docs/libempathy/Makefile
-   docs/libempathy/version.xml
-   docs/libempathy-gtk/Makefile
-   docs/libempathy-gtk/version.xml
    help/Makefile
-   python/Makefile
-   python/pyempathy/Makefile
-   python/pyempathygtk/Makefile
    tests/Makefile
    tests/xml/Makefile
    tools/Makefile
@@ -551,16 +448,12 @@ Configure summary:
 	Display maps (libchamplain).:  ${have_libchamplain}
 	Location awareness (Geoclue):  ${have_geoclue}
 	Adium themes (Webkit).......:  ${have_webkit}
-	Moblin widgets (Nbtk).......:  ${have_nbtk}
+	Moblin widgets .............:  ${have_moblin}
 
     Connectivity:
 	NetworkManager integration..:  ${have_nm}
 	ConnMan integration.........:  ${have_connman}
 
     Extras:
-	Documentation...............:  ${enable_gtk_doc}
-	Python bindings.............:  ${have_python}
-	Megaphone applet............:  ${have_megaphone}
-	Nothere applet..............:  ${have_nothere}
 	Nautilus-sendto plugin......:  ${have_nst}
 "