diff options
| -rw-r--r-- | configure.ac | 57 | ||||
| -rw-r--r-- | src/Makefile.am | 24 |
2 files changed, 37 insertions, 44 deletions
diff --git a/configure.ac b/configure.ac index cd52d75..adeac72 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([_PACKAGE], [cataract]) m4_define([_VERSION], [1.90.0]) m4_define([_APP_BUILD_DATE], [2013-04-09]) m4_define([_APP_NAME_FULL], [Cataract Gallery Generator]) -m4_define([_APP_COPYRIGHT_STRING], [Copyright (c) 2008-2013 Tomas Bzatek]) +m4_define([_APP_COPYRIGHT_STRING], [Copyright (c) 2008-2019 Tomas Bzatek]) m4_define([_APP_HOMEPAGE], [http://cgg.bzatek.net/]) AC_INIT([_PACKAGE], [_VERSION], [https://bugzilla.bzatek.net/enter_bug.cgi?product=CGG], [_PACKAGE], [_APP_HOMEPAGE]) @@ -34,65 +34,47 @@ AC_DEFINE_UNQUOTED(APP_NAME_FULL, ["_APP_NAME_FULL"], [full application name str AC_DEFINE_UNQUOTED(APP_COPYRIGHT_STRING, ["_APP_COPYRIGHT_STRING"], [copyright string]) AC_DEFINE_UNQUOTED(APP_HOMEPAGE, ["_APP_HOMEPAGE"], [homepage uri]) -dnl Check for pkgconfig first -AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - -dnl Give error and exit if we don't have pkgconfig -if test "x$HAVE_PKGCONFIG" = "xno"; then - AC_MSG_ERROR(you need to have pkgconfig installed !) -fi +dnl Compiler warnings +WARN_CFLAGS="-Wall -Wshadow -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare" +AC_SUBST(WARN_CFLAGS) -PKG_CHECK_MODULES(LIBS, [ - glib-2.0 >= $GLIB_REQUIRED - gthread-2.0 - libxml-2.0 - MagickWand - exiv2 >= $EXIV2_REQUIRED -]) -AC_SUBST(LIBS_CFLAGS) -AC_SUBST(LIBS_LIBS) +dnl ************************************************** +dnl *** Check for glib2 *** +dnl ************************************************** AM_PATH_GLIB_2_0($GLIB_REQUIRED, :, AC_MSG_ERROR([ *** GLIB $GLIB_REQUIRED or better is required. The latest version of. *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]), gobject gmodule-no-export gthread) - - DISABLE_DEPRECATED_CFLAGS=" -DG_DISABLE_DEPRECATED" AC_SUBST(DISABLE_DEPRECATED_CFLAGS) -dnl WARN_CFLAGS="-Wall -Werror" -WARN_CFLAGS="-Wall" -AC_SUBST(WARN_CFLAGS) - - -dnl ************************************************** -dnl *** Check for g_get_num_processors() presence *** -dnl ************************************************** +dnl Check for g_get_num_processors() presence AC_CHECK_LIB(glib-2.0, g_get_num_processors, [ AC_DEFINE(HAVE_G_GET_NUM_PROCESSORS, 1, [Define if glib has g_get_num_processors()])]) -dnl ************************************************** -dnl *** Check for new glib threading API *** -dnl ************************************************** +dnl Check for new glib threading API AC_CHECK_LIB(glib-2.0, g_thread_new, [ AC_DEFINE(HAVE_GLIB_NEW_THREADS, 1, [Define if glib has new threading API])]) dnl ************************************************** +dnl *** Check for libxml2 *** +dnl ************************************************** +PKG_CHECK_MODULES(LIBXML2, libxml-2.0) + + +dnl ************************************************** dnl *** Check for EXIV2 version *** dnl ************************************************** +PKG_CHECK_MODULES(EXIV2, exiv2 >= $EXIV2_REQUIRED) AC_MSG_CHECKING(for EXIV2 - version >= $EXIV2_REQUIRED) exiv2_version=`$PKG_CONFIG --modversion exiv2` AC_MSG_RESULT(yes (version $exiv2_version)) - -dnl ************************************************** -dnl *** Check for new exiv2 thumbnailing API *** -dnl ************************************************** +dnl Check for new exiv2 thumbnailing API AC_DEFUN([EXIV2_HAVE_NEW_THUMBNAILING_API], [AC_CACHE_CHECK(for new Exiv2::ExifThumb API, ac_cv_exiv2_have_new_exifthumb, @@ -118,8 +100,11 @@ EXIV2_HAVE_NEW_THUMBNAILING_API dnl ************************************************** -dnl *** Check for MagickWand version *** +dnl *** Check for ImageMagick *** dnl ************************************************** +PKG_CHECK_MODULES(MAGICKWAND, MagickWand) + +dnl Check for MagickWand version AC_MSG_CHECKING(for MagickWand) magick_wand_version=`$PKG_CONFIG --modversion MagickWand` AC_MSG_RESULT(yes (version $magick_wand_version)) diff --git a/src/Makefile.am b/src/Makefile.am index 5a4d3b2..ec7b3b1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,12 +1,15 @@ NULL = -AM_CPPFLAGS = \ - -DDATADIR=\"$(datadir)\" \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) \ - $(LIBS_CFLAGS) \ +AM_CPPFLAGS = \ + -DDATADIR=\"$(datadir)\" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(WARN_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(LIBXML2_CFLAGS) \ + $(MAGICKWAND_CFLAGS) \ + $(EXIV2_CFLAGS) \ -DG_LOG_DOMAIN=\"cgg\" bin_PROGRAMS = \ @@ -45,6 +48,11 @@ cgg_SOURCES = \ xml-parser.h \ $(NULL) -cgg_LDADD = $(LIBS_LIBS) -lm +cgg_LDADD = \ + $(GLIB_LIBS) \ + $(LIBXML2_LIBS) \ + $(MAGICKWAND_LIBS) \ + $(EXIV2_LIBS) \ + -lm EXTRA_DIST = cgg-dirgen |