Upgrage to 0.6.22tizen_7.0_m2_releasetizen_6.5.m2_releasesubmit/tizen_6.5/20211028.163501submit/tizen/20201026.023621accepted/tizen/unified/20201028.123852accepted/tizen/7.0/unified/hotfix/20221116.110951accepted/tizen/7.0/unified/20221110.063417accepted/tizen/6.5/unified/20211029.013555tizen_7.0_hotfixtizen_7.0tizen_6.5accepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unifiedaccepted/tizen_6.5_unified

Change-Id: I19b63acfb173b87854929a93779071e580f8bb98
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

1 files changed, 25 insertions, 43 deletions

diff --git a/configure.ac b/configure.ac
index a3ac72f..11b0e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,33 +1,14 @@
 AC_PREREQ(2.59)
-AC_INIT([EXIF library], [0.6.21], [libexif-devel@lists.sourceforge.net], [libexif])
+AC_INIT([EXIF library], [0.6.22], [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
 
 # Use the silent-rules feature when possible.
 m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
-AM_SILENT_RULES([no])
-
-# Checks for programs.
-m4_pattern_allow([AM_PROG_AR])
-AM_PROG_AR
-
-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
+AM_SILENT_RULES([yes])
 
 GP_CHECK_SHELL_ENVIRONMENT
 GP_CONFIG_MSG([Build])
@@ -64,9 +45,10 @@ 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
+dnl 15:3:4   0.6.22
 LIBEXIF_CURRENT=15
 LIBEXIF_AGE=3
-LIBEXIF_REVISION=3
+LIBEXIF_REVISION=4
 AC_SUBST([LIBEXIF_AGE])
 AC_SUBST([LIBEXIF_REVISION])
 AC_SUBST([LIBEXIF_CURRENT])
@@ -74,14 +56,16 @@ AC_SUBST([LIBEXIF_CURRENT_MIN],[`expr $LIBEXIF_CURRENT - $LIBEXIF_AGE`])
 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
@@ -103,10 +87,6 @@ AC_ARG_ENABLE([ship-binaries],
 AM_CONDITIONAL([SHIP_BINARIES],[$ship_binaries])
 GP_CONFIG_MSG([Ship binaries in tarball],[$ship_binaries])
 
-enable_docs=false
-AM_CONDITIONAL([BUILD_DOCS],[$enable_docs])
-AM_CONDITIONAL([HAVE_DOXYGEN],[$enable_docs])
-
 
 dnl ---------------------------------------------------------------------------
 dnl Whether -lm is required for our math functions
@@ -126,25 +106,23 @@ dnl ---------------------------------------------------------------------------
 LIBS_orig="$LIBS"
 LIBS="$LIBS -lm"
 AC_MSG_CHECKING([for math functions in libm])
-AC_LINK_IFELSE([
-	#include <math.h>
-	int main() {
-	  double s = sqrt(0);
-	  double p = pow(s,s);
-	  return (int)p;
-	}
-], [AC_MSG_RESULT(yes)], [
+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_LINK_IFELSE([AC_LANG_PROGRAM([
 		#include <math.h>
-		int main() {
+		],[
 		  double s = sqrt(0);
 		  double p = pow(s,s);
-		  return (int)p;
-		}
-	], [
+		])],
+	[
 		AC_MSG_RESULT(yes)
 	],[
 		AC_MSG_RESULT(no)
@@ -152,6 +130,9 @@ AC_LINK_IFELSE([
 	])
 ])
 
+# Check whether libfailmalloc is available for tests
+CHECK_FAILMALLOC
+
 # doc support
 GP_CHECK_DOC_DIR
 GP_CHECK_DOXYGEN
@@ -185,7 +166,7 @@ AM_CONDITIONAL([ENABLE_INTERNAL_DOCS], [test "x${set_enable_internal_docs}" = "x
 # ---------------------------------------------------------------------------
 # i18n support
 # ---------------------------------------------------------------------------
-ALL_LINGUAS="be bs cs da de en_AU en_CA en_GB es fr it ja nl pl pt pt_BR ru sk sq sr sv tr uk vi zh_CN"
+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])
@@ -227,6 +208,7 @@ AC_CONFIG_FILES([  po/Makefile.in
   libexif.spec
   libexif/Makefile
   test/Makefile
+  test/check-vars.sh
   test/nls/Makefile
   m4m/Makefile
   doc/Makefile
@@ -234,7 +216,7 @@ AC_CONFIG_FILES([  po/Makefile.in
   doc/Doxyfile-internals
   libexif.pc
   libexif-uninstalled.pc
-  binary/Makefile
+  binary-dist/Makefile
   contrib/Makefile
   contrib/examples/Makefile
 ])