summaryrefslogtreecommitdiff
path: root/graphics/poppler/files/patch-configure
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/poppler/files/patch-configure')
-rw-r--r--graphics/poppler/files/patch-configure36
1 files changed, 26 insertions, 10 deletions
diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure
index 9b176321a8ef..97b51246cc25 100644
--- a/graphics/poppler/files/patch-configure
+++ b/graphics/poppler/files/patch-configure
@@ -1,13 +1,29 @@
---- configure.orig 2012-08-08 11:59:15.000000000 +0200
-+++ configure 2012-08-08 11:59:45.000000000 +0200
-@@ -20271,8 +20271,8 @@
+--- configure.orig 2016-07-24 22:14:28 UTC
++++ configure
+@@ -20556,7 +20556,7 @@ fi
- ac_save_USER_INCLUDES="$USER_INCLUDES"
- ac_save_USER_LDFLAGS="$USER_LDFLAGS"
-- USER_INCLUDES="$USER_INCLUDES $LIBJPEG_CFLAGS"
-- USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_CFLAGS"
-+ USER_INCLUDES="$USER_INCLUDES $LIBJPEG_CFLAGS $CPPFLAGS"
-+ USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_LDFLAGS $LDFLAGS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+-ac_save_LIBS="$LDFLAGS"
++ac_save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $LIBTIFF_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS"
+ LIBS="$LIBS $LIBTIFF_LIBS"
+@@ -21387,7 +21387,7 @@ if ${ac_cv_lib_jpeg_6b+:} false; then :
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
++LIBS="$LIBS $USER_LDFLAGS -ljpeg6b -lm"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -21438,7 +21438,7 @@ if ${ac_cv_lib_jpeg_normal+:} false; the
+ else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg6b" >&5
+ ac_save_LIBS="$LIBS"
+-LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
++LIBS="$LIBS $USER_LDFLAGS -ljpeg -lm"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext