diff options
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 44 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 23 insertions, 25 deletions
@@ -83,7 +83,7 @@ autoconf || exit $? cd $ORIGDIR || exit $? if test -z "$AUTOGEN_SUBDIR_MODE"; then - $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? + $srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? echo echo "Now type 'make' to compile $PROJECT." diff --git a/configure.ac b/configure.ac index 907a1df..eeca0f5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,24 +1,21 @@ -AC_INIT +AC_PREREQ([2.64]) -PACKAGE=cataract -VERSION=1.1.0 -APP_BUILD_DATE=2010-12-05 -APP_NAME_FULL="Cataract Gallery Generator" -APP_COPYRIGHT_STRING="Copyright (c) 2008-2010 Tomas Bzatek" -APP_HOMEPAGE="http://cgg.bzatek.net/" +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_HOMEPAGE], [http://cgg.bzatek.net/]) -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) - -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -AM_MAINTAINER_MODE +AC_INIT([_PACKAGE], [_VERSION], [https://bugzilla.bzatek.net/enter_bug.cgi?product=CGG], [_PACKAGE], [_APP_HOMEPAGE]) +AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz tar-ustar]) AM_CONFIG_HEADER(config.h) GLIB_REQUIRED=2.16.0 EXIV2_REQUIRED=0.17 AC_C_CONST -AC_ISC_POSIX +AC_SEARCH_LIBS([strerror],[cposix]) AC_PROG_CC AC_PROG_CPP AC_PROG_CXX @@ -28,11 +25,14 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AM_PROG_CC_C_O +AC_FUNC_MKTIME +AC_TYPE_SIZE_T + dnl Propagate constants -AC_DEFINE_UNQUOTED(APP_BUILD_DATE, ["$APP_BUILD_DATE"], [build date]) -AC_DEFINE_UNQUOTED(APP_NAME_FULL, ["$APP_NAME_FULL"], [full application name string]) -AC_DEFINE_UNQUOTED(APP_COPYRIGHT_STRING, ["$APP_COPYRIGHT_STRING"], [copyright string]) -AC_DEFINE_UNQUOTED(APP_HOMEPAGE, ["$APP_HOMEPAGE"], [homepage uri]) +AC_DEFINE_UNQUOTED(APP_BUILD_DATE, ["_APP_BUILD_DATE"], [build date]) +AC_DEFINE_UNQUOTED(APP_NAME_FULL, ["_APP_NAME_FULL"], [full application name string]) +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) @@ -90,9 +90,8 @@ dnl ************************************************** AC_DEFUN([EXIV2_HAVE_NEW_THUMBNAILING_API], [AC_CACHE_CHECK(for new Exiv2::ExifThumb API, ac_cv_exiv2_have_new_exifthumb, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include <exiv2/image.hpp> +[AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <exiv2/image.hpp> #include <exiv2/exif.hpp> void test () { @@ -101,9 +100,8 @@ void test () { Exiv2::ExifThumb exifThumb(image->exifData()); exifThumb.erase(); } -],[return 0;], - ac_cv_exiv2_have_new_exifthumb=yes, ac_cv_exiv2_have_new_exifthumb=no) - AC_LANG_RESTORE +]], [[return 0;]])],[ac_cv_exiv2_have_new_exifthumb=yes],[ac_cv_exiv2_have_new_exifthumb=no]) + AC_LANG_POP([]) ]) if test "$ac_cv_exiv2_have_new_exifthumb" = yes; then AC_DEFINE(HAVE_EXIFTHUMB,1,[new Exiv2::ExifThumb API]) diff --git a/src/Makefile.am b/src/Makefile.am index 8c4aa15..9bd3448 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ NULL = -INCLUDES = \ +AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ |