tracker r2115 - in branches/indexer-split: . src/trackerd
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r2115 - in branches/indexer-split: . src/trackerd
- Date: Wed, 20 Aug 2008 15:12:50 +0000 (UTC)
Author: mr
Date: Wed Aug 20 15:12:49 2008
New Revision: 2115
URL: http://svn.gnome.org/viewvc/tracker?rev=2115&view=rev
Log:
* configure.ac: Clean up and remove the --enable-debug-tools. The
-g option is automatic with autotools and most packaging systems
(like debian's) have an option to strip binaries of debug symbols.
In the worst case we can always use CFLAGS="..." before running
./autogen.sh anyway.
* src/trackerd/tracker-monitor.c: Fixed a nasty NULL deference
spotted by Ross Burton.
Modified:
branches/indexer-split/ChangeLog
branches/indexer-split/configure.ac
branches/indexer-split/src/trackerd/tracker-monitor.c
Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac (original)
+++ branches/indexer-split/configure.ac Wed Aug 20 15:12:49 2008
@@ -10,8 +10,6 @@
AC_SUBST(PACKAGE_URL, [http://www.tracker-project.org])
-CFLAGS="$CFLAGS"
-
# Checks for programs.
AC_PROG_CC
AC_PROG_LN_S
@@ -19,11 +17,15 @@
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
+CFLAGS="$CFLAGS"
+
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h sitdlib.h string.h sys/time.h unistd.h linux/unistd.h])
-AC_CHECK_HEADER([zlib.h], [], [AC_MSG_ERROR([You must have zlib.h and zlib installed])])
+AC_CHECK_HEADER([zlib.h],
+ [],
+ [AC_MSG_ERROR([You must have zlib.h and zlib installed])])
# Can posix_fadvise be used
AC_CHECK_DECLS(posix_fadvise, [], [], [
@@ -40,51 +42,51 @@
PANGO_REQUIRED=1.0.0
GMIME_REQUIRED=2.1.0
-PKG_CHECK_MODULES(GLIB2, [ glib-2.0 >= $GLIB_REQUIRED ])
+PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED])
AC_SUBST(GLIB2_CFLAGS)
AC_SUBST(GLIB2_LIBS)
# Check for gthread 2.0
-PKG_CHECK_MODULES(GTHREAD, [ gthread-2.0 >= $GLIB_REQUIRED ])
+PKG_CHECK_MODULES(GTHREAD, [ gthread-2.0 >= $GLIB_REQUIRED])
AC_SUBST(GTHREAD_CFLAGS)
AC_SUBST(GTHREAD_LIBS)
# Check for gobject 2.0
-PKG_CHECK_MODULES(GOBJECT, [ gobject-2.0 >= $GLIB_REQUIRED ])
+PKG_CHECK_MODULES(GOBJECT, [gobject-2.0 >= $GLIB_REQUIRED])
AC_SUBST(GOBJECT_CFLAGS)
AC_SUBST(GOBJECT_LIBS)
# Check for gmodule 2.0
-PKG_CHECK_MODULES(GMODULE, [ gmodule-2.0 >= $GLIB_REQUIRED ])
+PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= $GLIB_REQUIRED])
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
-PKG_CHECK_MODULES(GIO, [ gio-2.0 >= $GLIB_REQUIRED ])
+PKG_CHECK_MODULES(GIO, [gio-2.0 >= $GLIB_REQUIRED])
AC_SUBST(GIO_CFLAGS)
AC_SUBST(GIO_LIBS)
# Check for pango
-PKG_CHECK_MODULES(PANGO, [ pango >= $PANGO_REQUIRED ])
+PKG_CHECK_MODULES(PANGO, [pango >= $PANGO_REQUIRED])
AC_SUBST(PANGO_CFLAGS)
AC_SUBST(PANGO_LIBS)
# Check for GMime
-PKG_CHECK_MODULES(GMIME, [ gmime-2.0 >= $GMIME_REQUIRED ])
+PKG_CHECK_MODULES(GMIME, [gmime-2.0 >= $GMIME_REQUIRED])
AC_SUBST(GMIME_CFLAGS)
AC_SUBST(GMIME_LIBS)
# Check for Dbus 0.50 or higher
-PKG_CHECK_MODULES(DBUS, [ dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED ])
+PKG_CHECK_MODULES(DBUS, [dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED])
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
# Check for libpng 1.2 or higher
-PKG_CHECK_MODULES(LIBPNG, [ libpng >= 1.2 ])
+PKG_CHECK_MODULES(LIBPNG, [libpng >= 1.2])
AC_SUBST(LIBPNG_CFLAGS)
AC_SUBST(LIBPNG_LIBS)
# Check for GConf
-PKG_CHECK_MODULES(GCONF, [ gconf-2.0 >= 2.2.0 ], have_gconf=yes, have_gconf=no)
+PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= 2.2.0], have_gconf=yes, have_gconf=no)
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
@@ -93,7 +95,7 @@
# Check we have the DBUS binding tool we need
AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool)
if test -z $DBUSBINDINGTOOL; then
- AC_MSG_ERROR([Could not find 'dbus-binding-tool'])
+ AC_MSG_ERROR([Could not find 'dbus-binding-tool'])
fi
GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
@@ -105,7 +107,8 @@
dnl DBus services dir
AC_ARG_WITH([session_bus_services_dir],
- AS_HELP_STRING([--with-session-bus-services-dir], [Path to DBus services directory]))
+ AS_HELP_STRING([--with-session-bus-services-dir],
+ [Path to DBus services directory]))
if test "x$with_session_bus_services_dir" = "x" ; then
services_dir="`pkg-config --variable session_bus_services_dir dbus-1`"
@@ -122,17 +125,18 @@
####################################################################
AC_ARG_ENABLE([deskbar_applet],
- AS_HELP_STRING([--enable-deskbar-applet=ARG], [Enable support for deskbar applet (handler, module, auto)]),,
+ AS_HELP_STRING([--enable-deskbar-applet=ARG],
+ [Enable support for deskbar applet (handler, module, auto)]),,
[enable_deskbar_applet=auto])
if test "x$enable_deskbar_applet" = "xauto" ; then
- if pkg-config --atleast-version=2.19 deskbar-applet ; then
- enable_deskbar_applet="module"
- elif pkg-config --atleast-version=2.16 deskbar-applet ; then
- enable_deskbar_applet="handler"
- else
- enable_deskbar_applet="no"
- fi
+ if pkg-config --atleast-version=2.19 deskbar-applet ; then
+ enable_deskbar_applet="module"
+ elif pkg-config --atleast-version=2.16 deskbar-applet ; then
+ enable_deskbar_applet="handler"
+ else
+ enable_deskbar_applet="no"
+ fi
fi
AM_CONDITIONAL(USING_DESKBAR_HANDLER, test "x$enable_deskbar_applet" = "xhandler")
@@ -142,28 +146,30 @@
AS_HELP_STRING([--with-deskbar-applet-dir], [Path to Deskbar handler/module directory]))
if test "x$enable_deskbar_applet" = "xhandler" ; then
- if test "x$with_deskbar_applet_dir" = "x" ; then
- handler_dir="`pkg-config --variable handlersdir deskbar-applet`"
- else
- handler_dir="$with_deskbar_applet_dir"
- fi
- if test "x$handler_dir" = "x" ; then
- handler_dir="\$(exec_prefix)/lib/deskbar-applet/handlers"
- fi
+ if test "x$with_deskbar_applet_dir" = "x" ; then
+ handler_dir="`pkg-config --variable handlersdir deskbar-applet`"
+ else
+ handler_dir="$with_deskbar_applet_dir"
+ fi
+
+ if test "x$handler_dir" = "x" ; then
+ handler_dir="\$(exec_prefix)/lib/deskbar-applet/handlers"
+ fi
fi
DESKBAR_HANDLER_DIR="$handler_dir"
AC_SUBST(DESKBAR_HANDLER_DIR)
if test "x$enable_deskbar_applet" = "xmodule" ; then
- if test "x$with_deskbar_applet_dir" = "x" ; then
- module_dir="`pkg-config --variable modulesdir deskbar-applet`"
- else
- module_dir="$with_deskbar_applet_dir"
- fi
- if test "x$module_dir" = "x" ; then
- module_dir="\$(exec_prefix)/lib/deskbar-applet/modules-2.20-compatible"
- fi
+ if test "x$with_deskbar_applet_dir" = "x" ; then
+ module_dir="`pkg-config --variable modulesdir deskbar-applet`"
+ else
+ module_dir="$with_deskbar_applet_dir"
+ fi
+
+ if test "x$module_dir" = "x" ; then
+ module_dir="\$(exec_prefix)/lib/deskbar-applet/modules-2.20-compatible"
+ fi
fi
DESKBAR_MODULE_DIR="$module_dir"
@@ -179,30 +185,18 @@
# Only use -Wall if we have gcc
if test "x$GCC" = "xyes"; then
- if test "x$enable_warnings" = "xyes"; then
- CFLAGS="\
- -Wall \
- -Wunused \
- -Wchar-subscripts \
- -Wmissing-declarations \
- -Wmissing-prototypes \
- -Wnested-externs \
- -Wpointer-arith \
- -Wsign-compare \
- $CFLAGS"
- fi
-fi
-
-####################################################################
-# Compiler generate debug code
-####################################################################
-
-AC_ARG_ENABLE([debug_code],
- AS_HELP_STRING([--enable-debug-code], [build with debug symbols]),,
- [enable_debug_code=no])
-
-if test "x$enable_debug_code" = "xyes"; then
- CFLAGS="-g -O0 $CFLAGS"
+ if test "x$enable_warnings" = "xyes"; then
+ CFLAGS="\
+ -Wall \
+ -Wunused \
+ -Wchar-subscripts \
+ -Wmissing-declarations \
+ -Wmissing-prototypes \
+ -Wnested-externs \
+ -Wpointer-arith \
+ -Wsign-compare \
+ $CFLAGS"
+ fi
fi
####################################################################
@@ -211,8 +205,7 @@
GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
- [The gettext translation domain])
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext translation domain])
AM_GLIB_GNU_GETTEXT
IT_PROG_INTLTOOL([0.35.0])
@@ -224,25 +217,29 @@
# * PKG_CONFIG_PATH must be set correctly
# * glib binaries must be in the PATH (i.e PATH=$PATH:/opt/xxx/bin)
####################################################################
+
GLIB_WITH_UNIT_TESTING=2.15.0
have_xesam_glib=no
AC_ARG_ENABLE(unit_tests,
- AS_HELP_STRING([--enable-unit-tests=@<:@no/yes/auto@:>@],
- [Enable unit tests (if available)]), ,
- [enable_unit_tests=auto])
+ AS_HELP_STRING([--enable-unit-tests=@<:@no/yes/auto@:>@],
+ [Enable unit tests (if available)]), ,
+ [enable_unit_tests=auto])
if test "x$enable_unit_tests" != "xno" ; then
glib_pkgconfig_tmp="glib-2.0 >= $GLIB_WITH_UNIT_TESTING"
- PKG_CHECK_MODULES(GLIB_UNIT_TEST, $glib_pkgconfig_tmp, [have_unit_tests=yes], [have_unit_tests=no])
+ PKG_CHECK_MODULES(GLIB_UNIT_TEST,
+ $glib_pkgconfig_tmp,
+ [have_unit_tests=yes],
+ [have_unit_tests=no])
if test "x$have_unit_tests" = "xyes" ; then
AC_DEFINE(HAVE_UNIT_TEST, 1, [Unit test framework available in glib])
AC_PATH_PROG(sqlite_exec, sqlite3)
if test -z $sqlite_exec; then
- AC_MSG_ERROR([Could not find 'sqlite3'])
+ AC_MSG_ERROR([Could not find 'sqlite3'])
fi
glib_pkgconfig=$glib_pkgconfig_tmp
@@ -250,7 +247,10 @@
if test "x$GTESTER" = "xno" ; then
AC_MSG_ERROR([*** Gtester is not in the path])
else
- PKG_CHECK_MODULES(XESAM_GLIB, xesam-glib, [have_xesam_glib=yes], [have_xesam_glib=no])
+ PKG_CHECK_MODULES(XESAM_GLIB,
+ xesam-glib,
+ [have_xesam_glib=yes],
+ [have_xesam_glib=no])
fi
fi
else
@@ -267,52 +267,53 @@
AM_CONDITIONAL(HAVE_UNIT_TESTS, test "x$have_unit_tests" = "xyes")
AM_CONDITIONAL(HAVE_XESAM_GLIB, test "x$have_xesam_glib" = "xyes")
-
####################################################################
# External QDBM check
####################################################################
QDBM_REQUIRED=1.8
-AC_ARG_ENABLE(external_qdbm,
- AS_HELP_STRING(
- [--enable-external-qdbm],
- [build using system's qdbm]),,
- [enable_external_qdbm=no])
+AC_ARG_ENABLE(external_qdbm,
+ AS_HELP_STRING([--enable-external-qdbm],
+ [build using system's qdbm]),,
+ [enable_external_qdbm=no])
if test "x$enable_external_qdbm" = "xyes"; then
- PKG_CHECK_MODULES(QDBM, [ qdbm >= $QDBM_REQUIRED ])
- AM_CONDITIONAL(USING_EXTERNAL_QDBM, true)
+ PKG_CHECK_MODULES(QDBM, [ qdbm >= $QDBM_REQUIRED ])
+ AM_CONDITIONAL(USING_EXTERNAL_QDBM, true)
else
- QDBM_CFLAGS="-I\$(top_srcdir)/src/qdbm"
- QDBM_LIBS="\$(top_builddir)/src/qdbm/libqdbm-private.la"
- AM_CONDITIONAL(USING_EXTERNAL_QDBM, false)
+ QDBM_CFLAGS="-I\$(top_srcdir)/src/qdbm"
+ QDBM_LIBS="\$(top_builddir)/src/qdbm/libqdbm-private.la"
+ AM_CONDITIONAL(USING_EXTERNAL_QDBM, false)
fi
AC_SUBST(QDBM_CFLAGS)
AC_SUBST(QDBM_LIBS)
-
-
##################################################################
# Check for libxml2
##################################################################
LIBXML2_REQUIRED=0.6
-AC_ARG_ENABLE(libxml2, AS_HELP_STRING([--disable-libxml2],[Disable HTML/XML extractors (full-text will still be available)]),,[enable_libxml2=yes])
+AC_ARG_ENABLE(libxml2,
+ AS_HELP_STRING([--disable-libxml2],
+ [Disable HTML/XML extractors (full-text will still be available)]),,
+ [enable_libxml2=yes])
+
if test "x$enable_libxml2" = "xyes"; then
- PKG_CHECK_MODULES(LIBXML2, [
- libxml-2.0 >= $LIBXML2_REQUIRED],
- [have_libxml2=yes] , [have_libxml2=no])
- AC_SUBST(LIBXML2_CFLAGS)
- AC_SUBST(LIBXML2_LIBS)
+ PKG_CHECK_MODULES(LIBXML2,
+ [libxml-2.0 >= $LIBXML2_REQUIRED],
+ [have_libxml2=yes],
+ [have_libxml2=no])
+ AC_SUBST(LIBXML2_CFLAGS)
+ AC_SUBST(LIBXML2_LIBS)
else
- have_libxml2="no (disabled)"
+ have_libxml2="no (disabled)"
fi
if test "x$have_libxml2" = "xyes"; then
- AC_DEFINE(HAVE_LIBXML2, [], [Define if we have libxml2])
+ AC_DEFINE(HAVE_LIBXML2, [], [Define if we have libxml2])
fi
AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
@@ -321,17 +322,24 @@
# Check for HAL
##################################################################
-AC_ARG_ENABLE(hal, AS_HELP_STRING([--disable-hal],[Disable HAL support for ac power detection]),,[enable_hal=yes])
+AC_ARG_ENABLE(hal,
+ AS_HELP_STRING([--disable-hal],
+ [Disable HAL support for ac power detection]),,
+ [enable_hal=yes])
+
if test "x$enable_hal" = "xyes"; then
- PKG_CHECK_MODULES(HAL, [hal >= 0.5 hal-storage], [have_hal=yes] , [have_hal=no])
- AC_SUBST(HAL_CFLAGS)
- AC_SUBST(HAL_LIBS)
+ PKG_CHECK_MODULES(HAL,
+ [hal >= 0.5 hal-storage],
+ [have_hal=yes] ,
+ [have_hal=no])
+ AC_SUBST(HAL_CFLAGS)
+ AC_SUBST(HAL_LIBS)
else
- have_hal="no (disabled)"
+ have_hal="no (disabled)"
fi
if test "x$have_hal" = "xyes"; then
- AC_DEFINE(HAVE_HAL, [], [Define if we have HAL])
+ AC_DEFINE(HAVE_HAL, [], [Define if we have HAL])
fi
AM_CONDITIONAL(HAVE_HAL, test "x$have_hal" = "xyes")
@@ -342,71 +350,73 @@
####################################################################
AC_ARG_ENABLE(video-extractor,
- AS_HELP_STRING(
- [--enable-video-extractor=ARG],
- [enables one of the (gstreamer, xine, external, auto) video extractor backends]),,
- [enable_video_extractor=auto])
+ AS_HELP_STRING([--enable-video-extractor=ARG],
+ [enables one of the (gstreamer, xine, external, auto) video extractor backends]),,
+ [enable_video_extractor=auto])
PKG_CHECK_MODULES(GSTREAMER,
- [gstreamer-0.10 >= 0.10.0],
- [have_libgstreamer=yes] , [have_libgstreamer=no])
+ [gstreamer-0.10 >= 0.10.0],
+ [have_libgstreamer=yes],
+ [have_libgstreamer=no])
+
AC_SUBST(GSTREAMER_CFLAGS)
AC_SUBST(GSTREAMER_LIBS)
PKG_CHECK_MODULES(XINE,
- [libxine >= 1.0],
- [have_libxine=yes] , [have_libxine=no])
+ [libxine >= 1.0],
+ [have_libxine=yes],
+ [have_libxine=no])
+
AC_SUBST(XINE_CFLAGS)
AC_SUBST(XINE_LIBS)
-
if test "x$enable_video_extractor" = "xauto"; then
- if test "$have_libgstreamer" = "yes"; then
- videos_handler="GStreamer"
- videos_are_handled="yes"
- elif test "$have_libxine" = "yes"; then
- videos_handler="Xine"
- videos_are_handled="yes"
- else
- videos_are_handled="?"
- videos_handler="An external video player will be called"
- fi
+ if test "$have_libgstreamer" = "yes"; then
+ videos_handler="GStreamer"
+ videos_are_handled="yes"
+ elif test "$have_libxine" = "yes"; then
+ videos_handler="Xine"
+ videos_are_handled="yes"
+ else
+ videos_are_handled="?"
+ videos_handler="An external video player will be called"
+ fi
elif test "x$enable_video_extractor" = "xgstreamer"; then
- if test "$have_libgstreamer" = "yes"; then
- videos_handler="GStreamer"
- videos_are_handled="yes"
- else
- AC_MSG_ERROR([***Gstreamer requested but not found - exiting!])
- fi
+ if test "$have_libgstreamer" = "yes"; then
+ videos_handler="GStreamer"
+ videos_are_handled="yes"
+ else
+ AC_MSG_ERROR([***Gstreamer requested but not found - exiting!])
+ fi
elif test "x$enable_video_extractor" = "xxine"; then
- if test "$have_libxine" = "yes"; then
- videos_handler="Xine"
- videos_are_handled="yes"
- else
- AC_MSG_ERROR([***libxine requested but not found - exiting!])
- fi
+ if test "$have_libxine" = "yes"; then
+ videos_handler="Xine"
+ videos_are_handled="yes"
+ else
+ AC_MSG_ERROR([***libxine requested but not found - exiting!])
+ fi
else
- videos_are_handled="?"
- videos_handler="An external video player will be called"
+ videos_are_handled="?"
+ videos_handler="An external video player will be called"
fi
+
if test "$videos_handler" = "GStreamer"; then
- AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have GStreamer])
- AM_CONDITIONAL(HAVE_GSTREAMER, true)
- AM_CONDITIONAL(HAVE_LIBXINE, false)
- AM_CONDITIONAL(USING_EXTERNAL_VIDEO_PLAYER, false)
+ AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have GStreamer])
+ AM_CONDITIONAL(HAVE_GSTREAMER, true)
+ AM_CONDITIONAL(HAVE_LIBXINE, false)
+ AM_CONDITIONAL(USING_EXTERNAL_VIDEO_PLAYER, false)
elif test "$videos_handler" = "Xine"; then
- AC_DEFINE(HAVE_LIBXINE, [], [Define if we have Libxine])
- AM_CONDITIONAL(HAVE_LIBXINE, true)
- AM_CONDITIONAL(HAVE_GSTREAMER, false)
- AM_CONDITIONAL(USING_EXTERNAL_VIDEO_PLAYER, false)
-else
- AC_DEFINE(USING_EXTERNAL_VIDEO_PLAYER, [], [Define that Tracker will try to use external video players])
- AM_CONDITIONAL(USING_EXTERNAL_VIDEO_PLAYER, true)
- AM_CONDITIONAL(HAVE_GSTREAMER, false)
- AM_CONDITIONAL(HAVE_LIBXINE, false)
+ AC_DEFINE(HAVE_LIBXINE, [], [Define if we have Libxine])
+ AM_CONDITIONAL(HAVE_LIBXINE, true)
+ AM_CONDITIONAL(HAVE_GSTREAMER, false)
+ AM_CONDITIONAL(USING_EXTERNAL_VIDEO_PLAYER, false)
+else
+ AC_DEFINE(USING_EXTERNAL_VIDEO_PLAYER, [], [Define that Tracker will try to use external video players])
+ AM_CONDITIONAL(USING_EXTERNAL_VIDEO_PLAYER, true)
+ AM_CONDITIONAL(HAVE_GSTREAMER, false)
+ AM_CONDITIONAL(HAVE_LIBXINE, false)
fi
-
####################################################################
# Windows check
####################################################################
@@ -455,35 +465,37 @@
SQLITE_REQUIRED=3.4
-PKG_CHECK_MODULES(SQLITE3, [ sqlite3 >= $SQLITE_REQUIRED ])
+PKG_CHECK_MODULES(SQLITE3, [sqlite3 >= $SQLITE_REQUIRED])
AC_SUBST(SQLITE3_CFLAGS)
AC_SUBST(SQLITE3_LIBS)
-
##################################################################
# Enable building libtracker-gtk?
##################################################################
+
LIBTRACKERGTK_GTK_REQUIRED=2.8.20
+AC_ARG_ENABLE([libtrackergtk],
+ AS_HELP_STRING([--disable-libtrackergtk], [Disable libtrackergtk]),,
+ [enable_libtrackergtk=yes])
-AC_ARG_ENABLE([libtrackergtk], AS_HELP_STRING([--disable-libtrackergtk], [Disable libtrackergtk]),,[enable_libtrackergtk=yes])
if test "x$enable_libtrackergtk" != "xno" ; then
-
- libtrackergtk_modules="\
+ libtrackergtk_modules="\
glib-2.0 >= $GLIB_REQUIRED, \
gtk+-2.0 >= $LIBTRACKERGTK_GTK_REQUIRED, \
dbus-1 >= $DBUS_REQUIRED, \
dbus-glib-1 >= $DBUS_REQUIRED"
- PKG_CHECK_MODULES(LIBTRACKERGTK, [$libtrackergtk_modules],[enable_libtrackergtk=yes] , [enable_libtrackergtk=no])
-
- AC_SUBST([LIBTRACKERGTK_CFLAGS])
- AC_SUBST([LIBTRACKERGTK_LIBS])
-
+ PKG_CHECK_MODULES(LIBTRACKERGTK,
+ [$libtrackergtk_modules],
+ [enable_libtrackergtk=yes],
+ [enable_libtrackergtk=no])
+ AC_SUBST([LIBTRACKERGTK_CFLAGS])
+ AC_SUBST([LIBTRACKERGTK_LIBS])
else
- enable_libtrackergtk="no (disabled)"
+ enable_libtrackergtk="no (disabled)"
fi
AM_CONDITIONAL(ENABLE_LIBTRACKERGTK, test "$enable_libtrackergtk" = "yes")
@@ -496,24 +508,27 @@
LIBNOTIFY_GLIB_REQUIRED=2.10
LIBNOTIFY_REQUIRED=0.4.3
-AC_ARG_ENABLE([trackerapplet], AS_HELP_STRING([--disable-trackerapplet], [Disable trackerapplet]),,[enable_trackerapplet=yes])
-if test "x$enable_trackerapplet" != "xno" ; then
+AC_ARG_ENABLE([trackerapplet],
+ AS_HELP_STRING([--disable-trackerapplet], [Disable trackerapplet]),,
+ [enable_trackerapplet=yes])
- trackerapplet_modules="\
+if test "x$enable_trackerapplet" != "xno" ; then
+ trackerapplet_modules="\
glib-2.0 >= $LIBNOTIFY_GLIB_REQUIRED, \
gtk+-2.0 >= $LIBNOTIFY_GTK2_REQUIRED, \
dbus-1 >= $DBUS_REQUIRED, \
dbus-glib-1 >= $DBUS_REQUIRED, \
libnotify >= $LIBNOTIFY_REQUIRED"
- PKG_CHECK_MODULES(TRACKERAPPLET, [$trackerapplet_modules],[enable_trackerapplet=yes] , [enable_trackerapplet=no])
-
- AC_SUBST([TRACKERAPPLET_CFLAGS])
- AC_SUBST([TRACKERAPPLET_LIBS])
-
+ PKG_CHECK_MODULES(TRACKERAPPLET,
+ [$trackerapplet_modules],
+ [enable_trackerapplet=yes],
+ [enable_trackerapplet=no])
+ AC_SUBST([TRACKERAPPLET_CFLAGS])
+ AC_SUBST([TRACKERAPPLET_LIBS])
else
- enable_trackerapplet="no (disabled)"
+ enable_trackerapplet="no (disabled)"
fi
AM_CONDITIONAL(ENABLE_TRACKERAPPLET, test "$enable_trackerapplet" = "yes")
@@ -522,26 +537,30 @@
# Enable UNAC support?
##################################################################
-AC_ARG_ENABLE([unac], AS_HELP_STRING([--disable-unac], [Disable unac accent stripper support]),,[enable_unac=yes])
+AC_ARG_ENABLE([unac],
+ AS_HELP_STRING([--disable-unac], [Disable unac accent stripper support]),,
+ [enable_unac=yes])
if test "x$enable_unac" != "xno" ; then
+ PKG_CHECK_MODULES(UNAC,
+ [unac >= 1.0.0],
+ [enable_unac=yes],
+ [enable_unac=no])
- PKG_CHECK_MODULES(UNAC, [unac >= 1.0.0],[enable_unac=yes] , [enable_unac=no])
-
- AC_SUBST([UNAC_CFLAGS])
- AC_SUBST([UNAC_LIBS])
-
+ AC_SUBST([UNAC_CFLAGS])
+ AC_SUBST([UNAC_LIBS])
else
- enable_unac="no (disabled)"
+ enable_unac="no (disabled)"
fi
if test "$enable_unac" = "yes"; then
- AC_DEFINE(HAVE_UNAC, [], [Define if we have unac lib])
+ AC_DEFINE(HAVE_UNAC, [], [Define if we have unac lib])
fi
+
AM_CONDITIONAL(ENABLE_UNAC, test "$enable_unac" = "yes")
##################################################################
-# Check for GNOME/GTK dependencies to build tracker search tool (Gnome client)
+# Check for GNOME/GTK dependencies to build tracker search tool
##################################################################
GTK_REQUIRED=2.8.0
@@ -550,40 +569,47 @@
LIBGNOMEUI_REQUIRED=2.13.7
GNOMEVFS_REQUIRED=2.8.4
-AC_ARG_ENABLE(gui, AS_HELP_STRING([--disable-gui], [Disable building of the tracker-search-tool]),,[enable_gui=yes])
+AC_ARG_ENABLE(gui,
+ AS_HELP_STRING([--disable-gui], [Disable building of the tracker-search-tool]),,
+ [enable_gui=yes])
+
if test "x$enable_gui" = "xyes"; then
- PKG_CHECK_MODULES(GNOME_UTILS, [
- gtk+-2.0 >= $GTK_REQUIRED
- libgnome-2.0 >= $LIBGNOME_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED],
- [have_gnome=yes] , [have_gnome=no])
- #there is the slight possibility to have gnome-vfs and not libgnome for example
- #so we should check and not overwrite have_gnome
- if test "$have_gnome" = "yes"; then
- PKG_CHECK_MODULES(GNOMEVFS, [
- gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED
- gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED],
- [have_gnome=yes] , [have_gnome=no])
- fi
- if test "$have_gnome" = "yes"; then
- PKG_CHECK_MODULES(GNOMEDESKTOP, [
- gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED],
- [have_gnome=yes] , [have_gnome=no])
- fi
- AC_SUBST(GNOME_UTILS_CFLAGS)
- AC_SUBST(GNOME_UTILS_LIBS)
- AC_SUBST(GNOMEVFS_CFLAGS)
- AC_SUBST(GNOMEVFS_LIBS)
- AC_SUBST(GNOMEDESKTOP_CFLAGS)
- AC_SUBST(GNOMEDESKTOP_LIBS)
+ PKG_CHECK_MODULES(GNOME_UTILS,
+ [gtk+-2.0 >= $GTK_REQUIRED
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED],
+ [have_gnome=yes],
+ [have_gnome=no])
+ if test "$have_gnome" = "yes"; then
+ PKG_CHECK_MODULES(GNOMEVFS,
+ [gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED
+ gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED],
+ [have_gnome=yes],
+ [have_gnome=no])
+ fi
+
+ if test "$have_gnome" = "yes"; then
+ PKG_CHECK_MODULES(GNOMEDESKTOP,
+ [gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED],
+ [have_gnome=yes],
+ [have_gnome=no])
+ fi
+
+ AC_SUBST(GNOME_UTILS_CFLAGS)
+ AC_SUBST(GNOME_UTILS_LIBS)
+
+ AC_SUBST(GNOMEVFS_CFLAGS)
+ AC_SUBST(GNOMEVFS_LIBS)
+
+ AC_SUBST(GNOMEDESKTOP_CFLAGS)
+ AC_SUBST(GNOMEDESKTOP_LIBS)
else
- have_gnome="no (disabled)"
+ have_gnome="no (disabled)"
fi
-
# do not build if libtracker-gtk is not being built
if test "x$enable_libtrackergtk" != "xyes"; then
- have_gnome="no (disabled as libtracker-gtk is not being built)"
+ have_gnome="no (disabled as libtracker-gtk is not being built)"
fi
AM_CONDITIONAL(HAVE_GNOME, test "$have_gnome" = "yes")
@@ -591,7 +617,6 @@
GNOME_COMMON_INIT
fi
-
##################################################################
# Checks for tracker-preferences
##################################################################
@@ -604,25 +629,35 @@
[enable_preferences=yes])
if test "x$enable_preferences" != "xno" ; then
+ PKG_CHECK_MODULES(GLIB2,
+ [glib-2.0 >= $PREFERENCES_GLIB_REQUIRED],
+ [enable_preference=yes],
+ [enable_preference=no])
+
+ AC_SUBST([GLIB2_CFLAGS])
+ AC_SUBST([GLIB2_LIBS])
+
+ if test "$enable_preferences" = "yes"; then
+ PKG_CHECK_MODULES(GTK2,
+ [gtk+-2.0 >= $PREFERENCES_GTK_REQUIRED],
+ [enable_preference=yes],
+ [enable_preference=no])
+
+ AC_SUBST([GTK2_CFLAGS])
+ AC_SUBST([GTK2_LIBS])
+ fi
+
+ if test "$enable_preferences" = "yes"; then
+ PKG_CHECK_MODULES(LIBGLADE,
+ [libglade-2.0 >= $PREFERENCES_GLADE_REQUIRED],
+ [enable_preferences=yes],
+ [enable_preferences=no])
- PKG_CHECK_MODULES(GLIB2, [ glib-2.0 >= $PREFERENCES_GLIB_REQUIRED ],[enable_preference=yes] , [enable_preference=no])
- AC_SUBST([GLIB2_CFLAGS])
- AC_SUBST([GLIB2_LIBS])
-
- if test "$enable_preferences" = "yes"; then
- PKG_CHECK_MODULES(GTK2, [ gtk+-2.0 >= $PREFERENCES_GTK_REQUIRED ],[enable_preference=yes] , [enable_preference=no])
- AC_SUBST([GTK2_CFLAGS])
- AC_SUBST([GTK2_LIBS])
- fi
-
- if test "$enable_preferences" = "yes"; then
-
- PKG_CHECK_MODULES(LIBGLADE, [ libglade-2.0 >= $PREFERENCES_GLADE_REQUIRED ], [enable_preferences=yes], [enable_preferences=no])
- AC_SUBST([LIBGLADE_CFLAGS])
- AC_SUBST([LIBGLADE_LIBS])
- fi
+ AC_SUBST([LIBGLADE_CFLAGS])
+ AC_SUBST([LIBGLADE_LIBS])
+ fi
else
- enable_preferences="no (disabled)"
+ enable_preferences="no (disabled)"
fi
AM_CONDITIONAL(ENABLE_PREFERENCES, test "$enable_preferences" = "yes")
@@ -635,20 +670,29 @@
CAIRO_REQUIRED=1.0
GDK_REQUIRED=1.0
-AC_ARG_ENABLE(pdf, AS_HELP_STRING([--disable-pdf], [Disable PDF data extractor]),,[enable_pdf=yes])
+AC_ARG_ENABLE(pdf,
+ AS_HELP_STRING([--disable-pdf], [Disable PDF data extractor]),,
+ [enable_pdf=yes])
+
if test "x$enable_pdf" = "xyes"; then
- PKG_CHECK_MODULES(POPPLER_GLIB, [
- poppler-glib >= $POPPLER_GLIB_REQUIRED
- cairo >= $CAIRO_REQUIRED
- gdk-2.0 >= $GDK_REQUIRED],
- [have_poppler=yes] , [have_poppler=no])
- AC_SUBST(POPPLER_GLIB_CFLAGS)
- AC_SUBST(POPPLER_GLIB_LIBS)
+ PKG_CHECK_MODULES(POPPLER_GLIB,
+ [poppler-glib >= $POPPLER_GLIB_REQUIRED
+ cairo >= $CAIRO_REQUIRED
+ gdk-2.0 >= $GDK_REQUIRED],
+ [have_poppler=yes],
+ [have_poppler=no])
+
+ AC_SUBST(POPPLER_GLIB_CFLAGS)
+ AC_SUBST(POPPLER_GLIB_LIBS)
else
- have_poppler="no (disabled)"
+ have_poppler="no (disabled)"
fi
+
AM_CONDITIONAL(HAVE_POPPLER_GLIB, test "$have_poppler" = "yes")
-test "$have_poppler" = "yes" && AC_DEFINE(HAVE_POPPLER, [], [Define if we have poppler])
+
+if test "$have_poppler" = "yes" ; then
+ AC_DEFINE(HAVE_POPPLER, 1, [Define if we have poppler])
+fi
##################################################################
# Check for libexif
@@ -656,18 +700,27 @@
LIBEXIF_REQUIRED=0.6
-AC_ARG_ENABLE(exif, AS_HELP_STRING([--disable-exif],[Disable exif data extractor]),,[enable_exif=yes])
+AC_ARG_ENABLE(exif,
+ AS_HELP_STRING([--disable-exif],[Disable exif data extractor]),,
+ [enable_exif=yes])
+
if test "x$enable_exif" = "xyes"; then
- PKG_CHECK_MODULES(LIBEXIF, [
- libexif >= $LIBEXIF_REQUIRED],
- [have_libexif=yes] , [have_libexif=no])
- AC_SUBST(LIBEXIF_CFLAGS)
- AC_SUBST(LIBEXIF_LIBS)
+ PKG_CHECK_MODULES(LIBEXIF,
+ [libexif >= $LIBEXIF_REQUIRED],
+ [have_libexif=yes],
+ [have_libexif=no])
+
+ AC_SUBST(LIBEXIF_CFLAGS)
+ AC_SUBST(LIBEXIF_LIBS)
else
- have_libexif="no (disabled)"
+ have_libexif="no (disabled)"
fi
+
AM_CONDITIONAL(HAVE_LIBEXIF, test "$have_libexif" = "yes")
-test "$have_libexif" = "yes" && AC_DEFINE(HAVE_LIBEXIF, [], [Define if we have libexif])
+
+if test "$have_libexif" = "yes" ; then
+ AC_DEFINE(HAVE_LIBEXIF, 1, [Define if we have libexif])
+fi
##################################################################
# Check for libgsf
@@ -675,49 +728,64 @@
LIBGSF_REQUIRED=1.13
-AC_ARG_ENABLE(gsf, AS_HELP_STRING([--disable-gsf], [Disable GSF data extractor]),,[enable_gsf=yes])
+AC_ARG_ENABLE(gsf,
+ AS_HELP_STRING([--disable-gsf], [Disable GSF data extractor]),,
+ [enable_gsf=yes])
+
if test "x$enable_gsf" = "xyes"; then
- PKG_CHECK_MODULES(LIBGSF,[
- libgsf-1 >= $LIBGSF_REQUIRED],
- [have_libgsf=yes] , [have_libgsf=no])
- AC_SUBST(LIBGSF_CFLAGS)
- AC_SUBST(LIBGSF_LIBS)
+ PKG_CHECK_MODULES(LIBGSF,
+ [libgsf-1 >= $LIBGSF_REQUIRED],
+ [have_libgsf=yes],
+ [have_libgsf=no])
+
+ AC_SUBST(LIBGSF_CFLAGS)
+ AC_SUBST(LIBGSF_LIBS)
else
- have_libgsf="no (disabled)"
+ have_libgsf="no (disabled)"
fi
+
AM_CONDITIONAL(HAVE_LIBGSF, test "$have_libgsf" = "yes")
-test "$have_libgsf" = "yes" && AC_DEFINE(HAVE_LIBGSF, [], [Define if we have libgsf])
+if test "$have_libgsf" = "yes" ; then
+ AC_DEFINE(HAVE_LIBGSF, 1, [Define if we have libgsf])
+fi
##################################################################
# Check for libjpeg
##################################################################
-#
# FIXME This should be package based. Unfortunately in several main
# distros, it is not.
-#
OLD_CFLAGS="$CFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
LIBS=""
-AC_ARG_ENABLE(jpeg, AS_HELP_STRING([--disable-jpeg],[Disable jpeg extractor]),,[enable_jpeg=yes])
+AC_ARG_ENABLE(jpeg,
+ AS_HELP_STRING([--disable-jpeg], [Disable jpeg extractor]),,
+ [enable_jpeg=yes])
+
if test "x$enable_jpeg" = "xyes"; then
- AC_CHECK_HEADER(jpeglib.h,
- AC_CHECK_LIB(jpeg, jpeg_CreateCompress))
- have_libjpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-no}
- LIBJPEG_CFLAGS="$CFLAGS"
- LIBJPEG_LIBS="$LIBS"
- AC_SUBST(LIBJPEG_CFLAGS)
- AC_SUBST(LIBJPEG_LIBS)
+ AC_CHECK_HEADER(jpeglib.h,
+ AC_CHECK_LIB(jpeg, jpeg_CreateCompress))
+
+ have_libjpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-no}
+
+ LIBJPEG_CFLAGS="$CFLAGS"
+ LIBJPEG_LIBS="$LIBS"
+
+ AC_SUBST(LIBJPEG_CFLAGS)
+ AC_SUBST(LIBJPEG_LIBS)
else
- have_libjpeg="no (disabled)"
+ have_libjpeg="no (disabled)"
fi
AM_CONDITIONAL(HAVE_LIBJPEG, test "$have_libjpeg" = "yes")
-test "$have_libjpeg" = "yes" && AC_DEFINE(HAVE_LIBJPEG, [], [Define if we have libjpeg])
+
+if test "$have_libjpeg" = "yes" ; then
+ AC_DEFINE(HAVE_LIBJPEG, 1, [Define if we have libjpeg])
+fi
CFLAGS="$OLD_CFLAGS"
LIBS="$OLD_LIBS"
@@ -729,28 +797,36 @@
#
# FIXME This should be package based. Unfortunately in several main
# distros, it is not.
-#
OLD_CFLAGS="$CFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
LIBS=""
-AC_ARG_ENABLE(tiff, AS_HELP_STRING([--disable-tiff],[Disable tiff extractor]),,[enable_tiff=yes])
+AC_ARG_ENABLE(tiff,
+ AS_HELP_STRING([--disable-tiff], [Disable tiff extractor]),,
+ [enable_tiff=yes])
+
if test "x$enable_tiff" = "xyes"; then
- AC_CHECK_HEADER(tiff.h,
- AC_CHECK_LIB(tiff, TIFFOpen))
- have_libtiff=${ac_cv_lib_tiff_TIFFOpen:-no}
- LIBTIFF_CFLAGS="$CFLAGS"
- LIBTIFF_LIBS="$LIBS"
- AC_SUBST(LIBTIFF_CFLAGS)
- AC_SUBST(LIBTIFF_LIBS)
+ AC_CHECK_HEADER(tiff.h,
+ AC_CHECK_LIB(tiff, TIFFOpen))
+
+ have_libtiff=${ac_cv_lib_tiff_TIFFOpen:-no}
+
+ LIBTIFF_CFLAGS="$CFLAGS"
+ LIBTIFF_LIBS="$LIBS"
+
+ AC_SUBST(LIBTIFF_CFLAGS)
+ AC_SUBST(LIBTIFF_LIBS)
else
- have_libtiff="no (disabled)"
+ have_libtiff="no (disabled)"
fi
AM_CONDITIONAL(HAVE_LIBTIFF, test "$have_libtiff" = "yes")
-test "$have_libtiff" = "yes" && AC_DEFINE(HAVE_LIBTIFF, [], [Define if we have libtiff])
+
+if test "$have_libtiff" = "yes" ; then
+ AC_DEFINE(HAVE_LIBTIFF, 1, [Define if we have libtiff])
+fi
CFLAGS="$OLD_CFLAGS"
LIBS="$OLD_LIBS"
@@ -761,25 +837,32 @@
AC_MSG_CHECKING([[ioprio support]])
have_ioprio=no
-AC_RUN_IFELSE([ AC_LANG_PROGRAM(
- [[
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/syscall.h>
-#include <unistd.h>
- ]],
- [[
-inline int ioprio_get (int which, int who)
-{
- return syscall (__NR_ioprio_get, which, who);
-}
-int main ()
-{
- return ioprio_get (1, 0);
-}
- ]]) ],
- [ AC_DEFINE(HAVE_IOPRIO,[],[Define ioprio support]) have_ioprio=yes ],
- [])
+
+AC_RUN_IFELSE(
+[AC_LANG_PROGRAM([[
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <sys/syscall.h>
+ #include <unistd.h>
+]],
+[[
+ inline int ioprio_get (int which, int who)
+ {
+ return syscall (__NR_ioprio_get, which, who);
+ }
+
+ int main ()
+ {
+ return ioprio_get (1, 0);
+ }
+]]
+)],
+[have_ioprio=yes],[])
+
+if test "$have_ioprio" = "yes" ; then
+ AC_DEFINE(HAVE_IOPRIO, 1, [Define if we have ioprio])
+fi
+
AC_MSG_RESULT([$have_ioprio])
##################################################################
@@ -788,50 +871,73 @@
EXEMPI_REQUIRED=1.99.2
-AC_ARG_ENABLE(xmp, AS_HELP_STRING([--disable-xmp], [Disable XMP extraction]),,[enable_xmp=yes])
+AC_ARG_ENABLE(xmp,
+ AS_HELP_STRING([--disable-xmp], [Disable XMP extraction]),,
+ [enable_xmp=yes])
+
if test "x$enable_xmp" = "xyes"; then
- PKG_CHECK_MODULES(EXEMPI,[
- exempi-2.0 >= $EXEMPI_REQUIRED],
- [have_exempi=yes] , [have_exempi=no])
- AC_SUBST(EXEMPI_CFLAGS)
- AC_SUBST(EXEMPI_LIBS)
+ PKG_CHECK_MODULES(EXEMPI,
+ [exempi-2.0 >= $EXEMPI_REQUIRED],
+ [have_exempi=yes],
+ [have_exempi=no])
+
+ AC_SUBST(EXEMPI_CFLAGS)
+ AC_SUBST(EXEMPI_LIBS)
else
- have_exempi="no (disabled)"
+ have_exempi="no (disabled)"
fi
+
AM_CONDITIONAL(HAVE_EXEMPI, test "$have_exempi" = "yes")
-test "$have_exempi" = "yes" && AC_DEFINE(HAVE_EXEMPI, [], [Define if we have exempi])
-#Check for binaries
+if test "$have_exempi" = "yes" ; then
+ AC_DEFINE(HAVE_EXEMPI, 1, [Define if we have exempi])
+fi
+
##################################################################
# Check for Imagemagick
##################################################################
-AC_ARG_ENABLE(imagemagick, AS_HELP_STRING([--disable-imagemagick], [Disable Imagemagick thumbnailer]),,[enable_imagemagick=yes])
+AC_ARG_ENABLE(imagemagick,
+ AS_HELP_STRING([--disable-imagemagick], [Disable Imagemagick thumbnailer]),,
+ [enable_imagemagick=yes])
+
if test "x$enable_imagemagick" = "xyes"; then
- AC_CHECK_PROG(HAVE_IMAGEMAGICK,convert,"yes","no",)
- have_imagemagick="$HAVE_IMAGEMAGICK"
+ AC_CHECK_PROG(HAVE_IMAGEMAGICK,convert,"yes","no",)
+ have_imagemagick="$HAVE_IMAGEMAGICK"
else
- have_imagemagick="no (disabled)"
+ have_imagemagick="no (disabled)"
fi
AM_CONDITIONAL(HAVE_IMAGEMAGICK, test "$have_imagemagick" = "yes")
-test "$have_imagemagick" = "yes" && AC_DEFINE(HAVE_IMAGEMAGICK, [], [Define if we have imagemagick])
+
+if test "$have_imagemagick" = "yes" ; then
+ AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define if we have imagemagick])
+fi
##################################################################
# Check for Hildon-thumbnail
##################################################################
-AC_ARG_ENABLE(hildon-thumbnail, AS_HELP_STRING([--disable-hildon-thumbnail], [Disable Hildon thumbnail]),,[enable_hildon_thumbnail=yes])
+AC_ARG_ENABLE(hildon-thumbnail,
+ AS_HELP_STRING([--disable-hildon-thumbnail], [Disable Hildon thumbnail]),,
+ [enable_hildon_thumbnail=yes])
+
if test "x$enable_hildon_thumbnail" = "xyes"; then
- AC_CHECK_PROG(HAVE_HILDON_THUMBNAIL,hildon-thumb-gdk-pixbuf,"yes","no",)
- have_hildon_thumbnail="$HAVE_HILDON_THUMBNAIL"
+ AC_CHECK_PROG(HAVE_HILDON_THUMBNAIL,hildon-thumb-gdk-pixbuf,"yes","no",)
+ have_hildon_thumbnail="$HAVE_HILDON_THUMBNAIL"
else
- have_hildon_thumbnail="no (disabled)"
+ have_hildon_thumbnail="no (disabled)"
fi
AM_CONDITIONAL(HAVE_HILDON_THUMBNAIL, test "$have_hildon_thumbnail" = "yes")
-test "$have_hildon_thumbnail" = "yes" && AC_DEFINE(HAVE_HILDON_THUMBNAIL, [], [Define if we have hildon-thumbnail])
+if test "$have_hildon_thumbnail" = "yes" ; then
+ AC_DEFINE(HAVE_HILDON_THUMBNAIL, 1, [Define if we have hildon-thumbnail])
+fi
+
+##################################################################
+# Write generated files
+##################################################################
AC_CONFIG_FILES([
data/dbus/Makefile
Modified: branches/indexer-split/src/trackerd/tracker-monitor.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-monitor.c (original)
+++ branches/indexer-split/src/trackerd/tracker-monitor.c Wed Aug 20 15:12:49 2008
@@ -1344,11 +1344,9 @@
file_monitor = libinotify_monitor_directory (monitor, file);
if (!file_monitor) {
- g_warning ("Could not add monitor for path:'%s', %s",
- path,
- error->message);
+ g_warning ("Could not add monitor for path:'%s'",
+ path);
g_free (path);
- g_error_free (error);
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
