Commit 393df7a8 authored by Cosimo Cecchi's avatar Cosimo Cecchi

build: simplify configure script

Also, don't support old exif/exempi APIs anymore.
parent 8d9d6128
#undef ENABLE_INSTALLER
#undef ENABLE_NLS
#undef ENABLE_PROFILER
#undef GETTEXT_PACKAGE
#undef HAVE_CATGETS
#undef HAVE_GETTEXT
#undef HAVE_LC_MESSAGES
#undef HAVE_LIBBZ2
#undef HAVE_LIBJPEG
#undef HAVE_MEDUSA
#undef HAVE_STPCPY
#undef bzclose
#undef bzCompress
#undef bzCompressInit
#undef bzDecompress
#undef bzDecompressInit
#undef bzdopen
#undef bzerror
#undef bzflush
#undef bzopen
#undef bzread
#undef bzwrite
#define HAVE_GTK_MULTIHEAD /* needed for egg-screen-exec functions */
#undef HAVE_STARTUP_NOTIFICATION
#undef HAVE_EXIF
#undef HAVE_OLD_EXIF
#undef HAVE_RENDER
......@@ -95,7 +95,6 @@ while (@directories)
if ($directory eq ".")
{
$headers{"acconfig.h"} = "acconfig.h";
$headers{"config.h"} = "config.h";
}
......
......@@ -8,8 +8,7 @@ m4_define(pango_minver, 1.1.2)
m4_define(gtk_minver, 2.91.1)
m4_define(xml_minver, 2.4.7)
m4_define(exif_minver, 0.5.12)
m4_define(exempi_minver, 1.99.2)
m4_define(exempi_minver_newapi, 1.99.5)
m4_define(exempi_minver, 1.99.5)
dnl 1. If the library code has changed at all since last release, then increment revision.
......@@ -18,8 +17,7 @@ dnl Interface break is not allowed.
m4_define(nautilus_extension_current, 3)
m4_define(nautilus_extension_revision, 0)
AC_INIT([nautilus],[2.91.0.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus])
AC_INIT(nautilus, 2.91.0.1, http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus)
dnl ===========================================================================
......@@ -32,13 +30,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE
AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
AC_SUBST(GLIB_REQUIRED, [glib_minver])
AC_SUBST(GNOME_DESKTOP_REQUIRED, [gnome_desktop_minver])
AC_SUBST(PANGO_REQUIRED, [pango_minver])
AC_SUBST(GTK_REQUIRED, [gtk_minver])
AC_SUBST(XML_REQUIRED, [xml_minver])
AC_SUBST(GAIL_REQUIRED)
dnl We need to decrement current by one in the calculation of the age because
dnl the library was started with version "1:0:0" instead of "0:0:0"
AC_SUBST(NAUTILUS_EXTENSION_VERSION_INFO, [nautilus_extension_current]:[nautilus_extension_revision]:`expr [nautilus_extension_current] - 1`)
......@@ -57,19 +48,6 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AC_CHECK_LIB(m, floor)
PKG_CHECK_MODULES(ALL, [
glib-2.0 >= glib_minver
gnome-desktop-3.0 >= gnome_desktop_minver
gthread-2.0
gio-unix-2.0
gio-2.0
pango >= pango_minver
gtk+-3.0 >= gtk_minver
libxml-2.0 >= xml_minver
gail-3.0 >= gtk_minver
gsettings-desktop-schemas
unique-3.0
])
dnl ==========================================================================
GETTEXT_PACKAGE=nautilus
......@@ -153,30 +131,28 @@ AC_CHECK_LIB(X11, XOpenDisplay, :,
$x_libs_for_checks)
dnl ==========================================================================
AM_CONDITIONAL(HAVE_EXIF, false)
dnl libexif checking
PKG_CHECK_MODULES(EXIF, libexif > exif_minver, [
AM_CONDITIONAL(HAVE_EXIF, true)
AC_DEFINE(HAVE_EXIF, 1, [Define to enable EXIF support])
], [
PKG_CHECK_MODULES(EXIF, libexif = exif_minver, [
AM_CONDITIONAL(HAVE_EXIF, true)
AC_DEFINE(HAVE_OLD_EXIF, 1, [Define if your EXIF library has old API])
], [AM_CONDITIONAL(HAVE_EXIF, false)])
])
AC_SUBST(EXIF_CFLAGS)
AC_SUBST(EXIF_LIBS)
AM_CONDITIONAL(HAVE_EXIF, false)
AC_ARG_ENABLE(libexif,
AC_HELP_STRING([--disable-libexif],
[build without libexif support]))
msg_libexif=no
if test "x$enable_libexif" != "xno"; then
PKG_CHECK_MODULES(EXIF, libexif > exif_minver, [
AM_CONDITIONAL(HAVE_EXIF, true)
AC_DEFINE(HAVE_EXIF, 1, [Define to enable EXIF support])
] msg_libexif=yes,
[AM_CONDITIONAL(HAVE_EXIF, false)])
AC_SUBST(EXIF_CFLAGS)
AC_SUBST(EXIF_LIBS)
fi
dnl ==========================================================================
dnl exempi checking
AM_CONDITIONAL(HAVE_EXEMPI, false)
AC_ARG_ENABLE(xmp,
AC_HELP_STRING([--disable-xmp],
[build without xmp support]))
......@@ -185,13 +161,9 @@ if test "x$enable_xmp" != "xno"; then
PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [
AM_CONDITIONAL(HAVE_EXEMPI, true)
AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable xmp support])
]
msg_xmp=yes,
] msg_xmp=yes,
[AM_CONDITIONAL(HAVE_EXEMPI, false)])
PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi,
AC_DEFINE(HAVE_EXEMPI_NEW_API, 1, [Define if we have exempi with the new API]), true)
AC_SUBST(EXEMPI_CFLAGS)
AC_SUBST(EXEMPI_LIBS)
fi
......@@ -314,35 +286,43 @@ AC_CHECK_LIB(Xrender, XRenderFindFormat,
if $have_render ; then
RENDER_LIBS="-lXrender -lXext"
AC_DEFINE(HAVE_RENDER)
AC_DEFINE(HAVE_RENDER, 1, [Define if Xrender is installed on the system])
fi
AC_SUBST(RENDER_LIBS)
dnl ==========================================================================
dnl libegg
LIBEGG_MODULES="gtk+-3.0"
LIBEGG_CFLAGS="`$PKG_CONFIG --cflags $LIBEGG_MODULES`"
AC_SUBST(LIBEGG_CFLAGS)
LIBEGG_LIBS="`$PKG_CONFIG --libs $LIBEGG_MODULES`"
AC_SUBST(LIBEGG_LIBS)
dnl libnautilus-extension
LIBNAUTILUS_EXTENSION_MODULES="glib-2.0 gtk+-3.0"
LIBNAUTILUS_EXTENSION_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_EXTENSION_MODULES`"
AC_SUBST(LIBNAUTILUS_EXTENSION_CFLAGS)
LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`"
AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
dnl core nautilus
CORE_MODULES="glib-2.0 gnome-desktop-3.0 gtk+-3.0 gthread-2.0 gio-2.0 gio-unix-2.0 gail-3.0 gconf-2.0 libxml-2.0 gsettings-desktop-schemas unique-3.0 $EXTRA_CORE_MODULES"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
AC_SUBST(CORE_CFLAGS)
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
AC_SUBST(CORE_LIBS)
dnl base libs
PKG_CHECK_MODULES(BASE, [
gtk+-3.0 >= gtk_minver
glib-2.0 >= glib_minver
])
AC_SUBST(BASE_CFLAGS)
AC_SUBST(BASE_LIBS)
dnl common libs (eel, nautilus)
PKG_CHECK_MODULES(COMMON, [
gail-3.0
gnome-desktop-3.0 >= gnome_desktop_minver
libxml-2.0 >= xml_minver
])
AC_SUBST(COMMON_CFLAGS)
AC_SUBST(COMMON_LIBS)
dnl additional nautilus libs
PKG_CHECK_MODULES(NAUTILUS, [
gthread-2.0 >= glib_minver
gio-2.0 >= glib_minver
gio-unix-2.0 >= glib_minver
gconf-2.0
gsettings-desktop-schemas
])
AC_SUBST(NAUTILUS_CFLAGS)
AC_SUBST(NAUTILUS_LIBS)
DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
......@@ -403,7 +383,8 @@ nautilus-$VERSION:
prefix: ${prefix}
source code location: ${srcdir}
compiler: ${CC}
xmp support: $msg_xmp
libexif support: $msg_libexif
libexempi support: $msg_xmp
PackageKit support: $msg_packagekit
profiling support: ${profiling_support}
......
......@@ -2,7 +2,7 @@ NULL=
noinst_LTLIBRARIES = libegg.la
INCLUDES = $(LIBEGG_CFLAGS)
INCLUDES = $(BASE_CFLAGS)
EGG_TREE_DND_FILES = \
eggtreemultidnd.c \
......@@ -26,7 +26,7 @@ libegg_la_SOURCES = \
libegg_la_CFLAGS = \
-DEGG_SM_CLIENT_BACKEND_XSMP \
-DG_LOG_DOMAIN=\""EggSMClient"\" \
$(LIBEGG_CFLAGS) \
$(BASE_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED)
......
......@@ -68,12 +68,12 @@ GTKDOC_CFLAGS = \
-I$(top_srcdir)/libnautilus-extension \
-I$(top_builddir) \
-I$(top_builddir)/libnautilus-extension \
$(LIBNAUTILUS_EXTENSION_CFLAGS) \
$(BASE_CFLAGS) \
$(NULL)
GTKDOC_LIBS = \
$(top_builddir)/libnautilus-extension/libnautilus-extension.la \
$(LIBNAUTILUS_EXTENSION_LIBS) \
$(BASE_LIBS) \
$(NULL)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
......
......@@ -6,7 +6,8 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"Eel\" \
-I$(top_srcdir) \
-I$(top_builddir) \
$(CORE_CFLAGS) \
$(BASE_CFLAGS) \
$(COMMON_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
......@@ -24,7 +25,8 @@ libeel_2_la_LDFLAGS = \
$(NULL)
libeel_2_la_LIBADD = \
$(CORE_LIBS) \
$(BASE_LIBS) \
$(COMMON_LIBS) \
$(RENDER_LIBS) \
$(X_LIBS) \
$(NULL)
......
......@@ -7,7 +7,7 @@ lib_LTLIBRARIES=libnautilus-extension.la
INCLUDES=\
-I$(top_srcdir) \
-I$(top_builddir) \
$(LIBNAUTILUS_EXTENSION_CFLAGS) \
$(BASE_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
......@@ -18,7 +18,7 @@ libnautilus_extension_la_LDFLAGS=\
-no-undefined \
$(NULL)
libnautilus_extension_la_LIBADD = $(LIBNAUTILUS_EXTENSION_LIBS)
libnautilus_extension_la_LIBADD = $(BASE_LIBS)
libnautilus_extension_includedir=$(includedir)/nautilus/libnautilus-extension
......@@ -73,7 +73,7 @@ Nautilus_2_0_gir_INCLUDES = Gtk-3.0 Gio-2.0 GLib-2.0
Nautilus_2_0_gir_CFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(LIBNAUTILUS_EXTENSION_CFLAGS)
$(BASE_CFLAGS)
Nautilus_2_0_gir_LIBS = libnautilus-extension.la
Nautilus_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
INTROSPECTION_GIRS += Nautilus-2.0.gir
......
......@@ -6,7 +6,9 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/cut-n-paste-code \
$(CORE_CFLAGS) \
$(BASE_CFLAGS) \
$(COMMON_CFLAGS) \
$(NAUTILUS_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(TRACKER_CFLAGS) \
......@@ -37,7 +39,9 @@ libnautilus_private_la_LIBADD = \
$(TRACKER_LIBS) \
$(top_builddir)/eel/libeel-2.la \
$(top_builddir)/libnautilus-extension/libnautilus-extension.la \
$(CORE_LIBS) \
$(BASE_LIBS) \
$(COMMON_LIBS) \
$(NAUTILUS_LIBS) \
$(NULL)
libnautilus_private_la_SOURCES = \
......
......@@ -17,7 +17,9 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/cut-n-paste-code \
-I$(top_builddir)/libnautilus-private \
$(CORE_CFLAGS) \
$(BASE_CFLAGS) \
$(COMMON_CFLAGS) \
$(NAUTILUS_CFLAGS) \
$(WARNING_CFLAGS) \
$(EXIF_CFLAGS) \
$(EXEMPI_CFLAGS) \
......@@ -36,6 +38,9 @@ INCLUDES = \
LDADD =\
$(top_builddir)/src/file-manager/libnautilus-file-manager.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
$(BASE_LIBS) \
$(COMMON_LIBS) \
$(NAUTILUS_LIBS) \
$(CORE_LIBS) \
$(EXIF_LIBS) \
$(EXEMPI_LIBS) \
......
......@@ -5,7 +5,9 @@ noinst_LTLIBRARIES=libnautilus-file-manager.la
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/cut-n-paste-code \
$(CORE_CFLAGS) \
$(BASE_CFLAGS) \
$(COMMON_CFLAGS) \
$(NAUTILUS_CFLAGS) \
$(WARNING_CFLAGS) \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
-DDATADIR=\""$(datadir)"\" \
......
......@@ -2,7 +2,9 @@ NULL=
INCLUDES =\
-I$(top_srcdir) \
$(CORE_CFLAGS) \
$(BASE_CFLAGS) \
$(COMMON_CFLAGS) \
$(NAUTILUS_CFLAGS) \
$(WARNING_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
......@@ -11,7 +13,9 @@ INCLUDES =\
LDADD =\
$(top_builddir)/libnautilus-private/libnautilus-private.la \
$(CORE_LIBS) \
$(BASE_LIBS) \
$(COMMON_LIBS) \
$(NAUTILUS_LIBS) \
$(NULL)
noinst_PROGRAMS =\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment