[Xfce4-commits] <squeeze:master> Fix configure.in.in

[Stephan Arts]

Updating branch refs/heads/master
         to ca03ff1638abf01e77ba9af1d250eaf158f85611 (commit)
       from b62f01c98d75dae2a4b6c52e72cc76a3a2e7072a (commit)

commit ca03ff1638abf01e77ba9af1d250eaf158f85611
Author: Stephan Arts <stephan at xfce.org>
Date:   Sat Aug 20 13:22:36 2011 +0200

    Fix configure.in.in

 configure.in.in |   46 +++++++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index ef8ac17..343cf1d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -12,12 +12,12 @@ dnl ***************************
 m4_define([squeeze_verinfo], [0:3:0])
 m4_define([squeeze_version_branch], [])
 m4_define([squeeze_version_major], [0])
-m4_define([squeeze_version_minor], [2])
+m4_define([squeeze_version_minor], [4])
 m4_define([squeeze_version_micro], [90])
 m4_define([squeeze_version_nano], []) # Leave empty for no nano version
 m4_define([squeeze_version_build], [r at REVISION@])
 m4_define([squeeze_version_tag], [svn]) # Leave empty for releases
-m4_define([squeeze_version], [ifelse(squeeze_version_branch(), [], [squeeze_version_major().squeeze_version_minor().squeeze_version_micro()ifelse(squeeze_version_nano(), [], [], [.squeeze_version_nano()])], [squeeze_version_branch()])ifelse(squeeze_version_tag(),[],[], [-ifelse(squeeze_version_tag(), [svn], [squeeze_version_tag()-squeeze_version_build()], [squeeze_version_tag()])])])
+m4_define([squeeze_version], [ifelse(squeeze_version_branch(), [], [squeeze_version_major().squeeze_version_minor().squeeze_version_micro()ifelse(squeeze_version_nano(), [], [], [.squeeze_version_nano()])], [squeeze_version_branch()])ifelse(squeeze_version_tag(),[],[], [-ifelse(squeeze_version_tag(), [dev], [squeeze_version_tag()-squeeze_version_build()], [squeeze_version_tag()])])])
 
 dnl *******************************************
 dnl *** Debugging support for SVN snapshots ***
@@ -27,7 +27,8 @@ m4_define([squeeze_debug_default], [ifelse(squeeze_version_tag(), [svn], [full],
 AC_COPYRIGHT([Copyright (c) 2006
         The Xfce development team. All rights reserved.
 
-Written for Xfce by Stephan Arts <stephan at xfce.org>.])
+Written for Xfce by Stephan Arts <stephan at xfce.org>
+                 and Peter de Ridder <peter at xfce.org>.])
 
 AC_INIT([Squeeze], [squeeze_version], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
@@ -64,26 +65,37 @@ dnl Check for i18n support
 XDT_I18N([@LINGUAS@])
 
 
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.20.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
 XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.34])
 
-AC_DEFINE([HAVE_LIBXFCE4UTIL], [1], [Define if we have libxfce4util (will become optional eventually)])
-AC_DEFINE([EXO_API_SUBJECT_TO_CHANGE], [1], [Define we understand libexo is subject to api churn])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0])
+
 dnl Some distro's have dbus < 1.0, need to define the following to make it compile. (Squeeze depends on the glib-bindings anyways)
 AC_DEFINE([DBUS_API_SUBJECT_TO_CHANGE], [1], [Define we understand dbus is subject to api churn])
 
+AC_ARG_ENABLE([pcre], 
+    AC_HELP_STRING([--enable-pcre], [Enable pcre (default)])
+AC_HELP_STRING([--disable-pcre], [Disable pcre]),
+    [check_for_pcre=$enableval], [check_for_pcre=yes])
+if test x"$check_for_pcre" = x"yes"; then
+    AC_CHECK_LIB([pcre], [main],[found_pcre=yes] , [found_pcre=no])
+    AC_MSG_CHECKING([for optional package pcre])
+    if test x"$found_pcre" = x"yes"; then
+        AC_MSG_RESULT([enabled])
+        AC_DEFINE([HAVE_PCRE], [1], [Define if libpcre is present])
+    else
+        AC_MSG_RESULT([disabled])
+    fi
+else
+    AC_MSG_CHECKING([for optional package pcre])
+    AC_MSG_RESULT([disabled])
+fi
+AM_CONDITIONAL([HAVE_PCRE], [test x"$found_git" = x"yes"])
 
-dnl XDT_CHECK_OPTIONAL_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0], [thunar-vfs],
-dnl    AC_HELP_STRING([--disable-thunar-vfs],
-dnl                   [Disable the use of Thunar's VFS layer)]))
-
-dnl XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99], [libxfce4util],
-dnl    AC_HELP_STRING([--disable-libxfce4util],
-dnl                   [Disable the use of libxfce4util)]))
 
 AC_ARG_ENABLE([pathbar],
    [AC_HELP_STRING([--disable-pathbar],