AC_PREREQ(2.59)
-AC_INIT([EXIF library], [0.6.17.1], [libexif-devel@lists.sourceforge.net], [libexif])
+AC_INIT([EXIF library], [0.6.21.1], [libexif-devel@lists.sourceforge.net], [libexif])
AC_CONFIG_SRCDIR([libexif/exif-data.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([auto-m4])
-AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 dist-zip check-news])
+AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 dist-zip check-news subdir-objects])
+AM_MAINTAINER_MODE
-if test ! -d "$srcdir/m4m"; then
-AC_MSG_ERROR([
-You are missing the m4m/ directory in your top
-$PACKAGE_TARNAME source directory.
-
-You are probably using an ill-maintained CVS tree.
-Running
-
- cd $srcdir
- cvs co m4m
-
-and re-running autogen.sh might help.
-])
-fi
+# Use the silent-rules feature when possible.
+m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+AM_SILENT_RULES([yes])
GP_CHECK_SHELL_ENVIRONMENT
GP_CONFIG_MSG([Build])
dnl ---------------------------------------------------------------------------
dnl Advanced information about versioning:
dnl * "Writing shared libraries" by Mike Hearn
-dnl http://navi.cx/~mike/writing-shared-libraries.html
+dnl http://plan99.net/~mike/writing-shared-libraries.html
dnl * libtool.info chapter "Versioning"
dnl * libtool.info chapter "Updating library version information"
dnl ---------------------------------------------------------------------------
dnl 13:1:0 added EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE (for 0.6.14)
dnl 14:2:0 added XP_ WinXP tags (for 0.6.15)
dnl 14:2:1 0.6.17
-LIBEXIF_CURRENT=14
-LIBEXIF_AGE=2
-LIBEXIF_REVISION=1
+dnl 15:3:0 added exif_loader_get_buf (for 0.6.18)
+dnl 15:3:1 0.6.19
+dnl 15:3:2 0.6.20
+dnl 15:3:3 0.6.21
+LIBEXIF_CURRENT=15
+LIBEXIF_AGE=3
+LIBEXIF_REVISION=3
AC_SUBST([LIBEXIF_AGE])
AC_SUBST([LIBEXIF_REVISION])
AC_SUBST([LIBEXIF_CURRENT])
LIBEXIF_VERSION_INFO="$LIBEXIF_CURRENT:$LIBEXIF_REVISION:$LIBEXIF_AGE"
AC_SUBST([LIBEXIF_VERSION_INFO])
-AC_PROG_CC
+AM_PROG_CC_C_O
AC_C_CONST
+AC_C_INLINE
dnl FIXME: AC_LIBTOOL_WIN32_DLL
+AM_PROG_AR
AM_PROG_LIBTOOL
AM_CPPFLAGS="$CPPFLAGS"
GP_CONFIG_MSG([Compiler],[${CC}])
+AC_SYS_LARGEFILE
dnl Create a stdint.h-like file containing size-specific integer definitions
dnl that will always be available
dnl Whether -lm is required for our math functions
dnl ---------------------------------------------------------------------------
-# we need sqrt and pow, but checking for sqrt should be sufficient
-AC_ARG_VAR([MATHLIBS],[The libraries required for mathematical functions, e.g. -lm])
-if test "x$MATHLIBS" = "x"; then
- # We must not compile with -Wall -Werror here:
- # char *sqrt() conflicts with double sin(const double xx) in any case.
- CFLAGS_save="$CFLAGS"
- CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS=""
- CFLAGS=""
- AC_CHECK_FUNC([sqrt],[
- MATHLIBS=""
- ],[
- AC_CHECK_LIB([m],[sqrt],[
- MATHLIBS="-lm"
+# we need sqrt and pow which may be in libm
+# We cannot use AC_CHECK_FUNC because if CFLAGS contains
+# -Wall -Werror here the check fails because
+# char *sqrt() conflicts with double sqrt(double xx)
+
+# Start by assuming -lm is needed, because it's possible that the little
+# test program below will be optimized to in-line floating point code that
+# doesn't require -lm, whereas the library itself cannot be so optimized
+# (this actually seems to be the case on x86 with gcc 4.2). Assuming the
+# reverse means that -lm could be needed but wouldn't be detected below.
+
+LIBS_orig="$LIBS"
+LIBS="$LIBS -lm"
+AC_MSG_CHECKING([for math functions in libm])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([
+ #include <math.h>
+ ],[
+ double s = sqrt(0);
+ double p = pow(s,s);
+ ])],
+ [AC_MSG_RESULT(yes)], [
+ AC_MSG_RESULT(no)
+ LIBS="$LIBS_orig"
+ AC_MSG_CHECKING([for math functions without libm])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([
+ #include <math.h>
],[
- AC_MSG_ERROR([
-*** Could not find sqrt() function
-])
- ])
+ double s = sqrt(0);
+ double p = pow(s,s);
+ ])],
+ [
+ AC_MSG_RESULT(yes)
+ ],[
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([*** Could not find sqrt() & pow() functions])
])
- CFLAGS="$CFLAGS_save"
- CPPFLAGS="$CPPFLAGS_save"
-fi
-AC_SUBST([MATHLIBS])
+])
+# Check whether libfailmalloc is available for tests
+CHECK_FAILMALLOC
# doc support
GP_CHECK_DOC_DIR
# ---------------------------------------------------------------------------
# i18n support
# ---------------------------------------------------------------------------
-ALL_LINGUAS="cs de en_CA es fr nl pl ru sk sv vi"
+ALL_LINGUAS="be bs cs da de en_AU en_CA en_GB es fr it ja ms nl pl pt pt_BR ru sk sq sr sv tr uk vi zh_CN"
AM_PO_SUBDIRS
GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT_MIN}],
[Lutz Mueller and others])
libexif.spec
libexif/Makefile
test/Makefile
+ test/check-vars.sh
test/nls/Makefile
m4m/Makefile
doc/Makefile