Changes to make Exiv2 cross-compile smoothly for win32

config/configure.ac

@@ -71,11 +71,9 @@ AC_SUBST(GCC,$GCC)
 # Checks for library functions.
 # ---------------------------------------------------------------------------
 AC_FUNC_ALLOCA
-AC_FUNC_MALLOC
 AC_FUNC_MEMCMP
 AC_FUNC_MKTIME
 AC_FUNC_MMAP
-AC_FUNC_REALLOC
 AC_FUNC_STAT
 AC_FUNC_STRERROR_R
 AC_FUNC_STRFTIME
@@ -108,6 +106,13 @@ if test "$USE_LENSDATA" = "yes"; then
     AC_DEFINE(HAVE_LENSDATA,1)
 fi
 
+if test "$enable_shared" = "no"; then
+    EXV_LIB_STATIC=$LTLIBICONV
+else
+    EXV_LIB_STATIC=
+fi
+AC_SUBST(EXV_LIB_STATIC)
+
 # ---------------------------------------------------------------------------
 # Create output files.
 # ---------------------------------------------------------------------------

config/exiv2.pc.in

@@ -7,6 +7,6 @@ Name: exiv2
 Description: Exif and IPTC metadata library and tools
 Version: @PACKAGE_VERSION@
 URL: http://www.exiv2.org
-Libs: -L${libdir} -lexiv2
+Libs: -L${libdir} -lexiv2 @EXV_LIB_STATIC@
 Libs.private: @LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@
 Cflags: -I${includedir}