Updated exiv2.pc template.

config/configure.ac

@@ -124,14 +124,6 @@ else
     fi
 fi
 
-# Udi's hack to add libiconv to the Libs section in exiv2.pc
-if test "$enable_shared" = "no"; then
-    EXV_LIB_STATIC=$LTLIBICONV
-else
-    EXV_LIB_STATIC=
-fi
-AC_SUBST(EXV_LIB_STATIC)
-
 AC_MSG_CHECKING([whether to compile a commercial version of the Exiv2 library])
 AC_ARG_ENABLE(commercial,
     [  --enable-commercial     compile with the EXV_COMMERCIAL_VERSION symbol set ],
@@ -186,6 +178,14 @@ AC_SUBST(ENABLE_XMP)
 CPPFLAGS=${_cppflags}
 LDFLAGS=${_ldflags}
 
+# Udi's hack to add libiconv to the Libs section in exiv2.pc
+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,5 +7,5 @@ Name: exiv2
 Description: Exif and IPTC metadata library and tools
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lexiv2 @EXV_LIB_STATIC@
-Libs.private: @LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@
+Libs.private: @LDFLAGS@ @EXPAT_LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@ @EXPAT_LIBS@
 Cflags: -I${includedir}