summaryrefslogtreecommitdiff
path: root/external/poppler/poppler-libjpeg.patch.1
blob: c8d54beb75ae7fd4dfc5030a4b2793359347eb3d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
do not override user supplied LIBJPEG_LIBS so we can use the one in WORKDIR

--- poppler/configure.orig	2016-11-02 13:58:32.530617038 +0100
+++ poppler/configure	2016-11-02 13:58:06.233617689 +0100
@@ -21377,8 +21377,9 @@
           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_LDFLAGS="$USER_LDFLAGS $LIBJPEG_LIBS"
 
+if test -z "$LIBJPEG_LIBS"; then
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg6b" >&5
 $as_echo_n "checking for libjpeg6b... " >&6; }
@@ -21489,6 +21490,7 @@
 
 
 fi
+fi
 
 
 ac_save_CPPFLAGS="$CPPFLAGS"