File inkscape-0.47-libpng.patch of Package mingw64-inkscape

Overview Repositories Revisions Requests Users Attributes Meta

File inkscape-0.47-libpng.patch of Package mingw64-inkscape (Revision ee42b73d05ccb79f8f0c0f7c348215b3)

Currently displaying revision ee42b73d05ccb79f8f0c0f7c348215b3 , Show latest

Only in inkscape-0.47: =
diff -ur configure.ac configure.ac
--- configure.ac	2009-11-16 21:45:59.000000000 +0100
+++ configure.ac	2010-02-11 13:16:33.000000000 +0100
@@ -155,9 +155,31 @@
 dnl ******************************
 dnl Check for libpng 
 dnl ******************************
-AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=yes)], png_ok=no, -lz -lm)
+for l in libpng libpng14 libpng12; do
+  AC_MSG_CHECKING(for $l version >= 1.2)
+  if $PKG_CONFIG --exists $l ; then
+    if test "`$PKG_CONFIG --modversion $l |  cut -d. -f1`" -gt "1" -o\
+        "`$PKG_CONFIG --modversion $l |  cut -d. -f1`" -eq "1" -a \
+        "`$PKG_CONFIG --modversion $l |  cut -d. -f2`" -ge "2" ; then
+      AC_MSG_RESULT(yes)
+      PNG_LIBS=`$PKG_CONFIG --libs $l`
+      png_ok=yes
+      break
+	else
+      AC_MSG_RESULT(no)
+	  png_ok=no
+    fi
+  else
+    AC_MSG_RESULT(no)
+    png_ok=no
+  fi
+done
+if test "$png_ok" != yes; then
+  PNG_LIBS="-lpng"
+  AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=yes)], png_ok=no, -lz -lm)
+fi
 if test "x$png_ok" != "xyes"; then
-	AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape])
+  AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape])
 fi
 
 dnl Handle possible dlopen requirement for libgc
@@ -676,9 +698,9 @@
 
 dnl Shouldn't we test for libpng and libz?
 if test "x$openmp_ok" = "xyes"; then
-	INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lgomp"
+	INKSCAPE_LIBS="$INKSCAPE_LIBS $PNG_LIBS -lz -lgomp"
 else
-	INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
+	INKSCAPE_LIBS="$INKSCAPE_LIBS $PNG_LIBS -lz"
 fi
 
 AC_CHECK_HEADER(popt.h,

Places

File inkscape-0.47-libpng.patch of Package mingw64-inkscape (Revision ee42b73d05ccb79f8f0c0f7c348215b3)

Places