Lines 1-13
Link Here
|
1 |
--- configure.orig 2012-08-08 11:59:15.000000000 +0200 |
1 |
--- configure.orig 2016-07-24 22:14:28 UTC |
2 |
+++ configure 2012-08-08 11:59:45.000000000 +0200 |
2 |
+++ configure |
3 |
@@ -20271,8 +20271,8 @@ |
3 |
@@ -20556,7 +20556,7 @@ fi |
4 |
|
4 |
|
5 |
ac_save_USER_INCLUDES="$USER_INCLUDES" |
5 |
ac_save_CPPFLAGS="$CPPFLAGS" |
6 |
ac_save_USER_LDFLAGS="$USER_LDFLAGS" |
6 |
ac_save_CXXFLAGS="$CXXFLAGS" |
7 |
- USER_INCLUDES="$USER_INCLUDES $LIBJPEG_CFLAGS" |
7 |
-ac_save_LIBS="$LDFLAGS" |
8 |
- USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_CFLAGS" |
8 |
+ac_save_LIBS="$LIBS" |
9 |
+ USER_INCLUDES="$USER_INCLUDES $LIBJPEG_CFLAGS $CPPFLAGS" |
9 |
CPPFLAGS="$CPPFLAGS $LIBTIFF_CFLAGS" |
10 |
+ USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_LDFLAGS $LDFLAGS" |
10 |
CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS" |
|
|
11 |
LIBS="$LIBS $LIBTIFF_LIBS" |
12 |
@@ -21387,7 +21387,7 @@ if ${ac_cv_lib_jpeg_6b+:} false; then : |
13 |
else |
11 |
|
14 |
|
|
|
15 |
ac_save_LIBS="$LIBS" |
16 |
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm" |
17 |
+LIBS="$LIBS $USER_LDFLAGS -ljpeg6b -lm" |
18 |
ac_save_CFLAGS="$CFLAGS" |
19 |
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" |
20 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
21 |
@@ -21438,7 +21438,7 @@ if ${ac_cv_lib_jpeg_normal+:} false; the |
22 |
else |
12 |
|
23 |
|
13 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg6b" >&5 |
24 |
ac_save_LIBS="$LIBS" |
|
|
25 |
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm" |
26 |
+LIBS="$LIBS $USER_LDFLAGS -ljpeg -lm" |
27 |
ac_save_CFLAGS="$CFLAGS" |
28 |
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" |
29 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |