blob: eadf68dde245c9c8d88bd7d0a981d3e5790f0770 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure qrencode-3.1.1-ok/configure
--- qrencode-3.1.1/configure 2010-02-02 19:43:16.000000000 -0500
+++ qrencode-3.1.1-ok/configure 2010-02-03 21:41:43.205709796 -0500
@@ -11445,12 +11445,12 @@
pkg_cv_png_CFLAGS="$png_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5
+ ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null`
+ pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng14"" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11463,12 +11463,12 @@
pkg_cv_png_LIBS="$png_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5
+ ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null`
+ pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng14"" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11487,14 +11487,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""`
+ png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng14""`
else
- png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""`
+ png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng14""`
fi
# Put the nasty error message in config.log where it belongs
echo "$png_PKG_ERRORS" >&5
- as_fn_error "Package requirements (\"libpng12\") were not met:
+ as_fn_error "Package requirements (\"libpng14\") were not met:
$png_PKG_ERRORS
diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure.ac qrencode-3.1.1-ok/configure.ac
--- qrencode-3.1.1/configure.ac 2010-02-02 19:42:12.000000000 -0500
+++ qrencode-3.1.1-ok/configure.ac 2010-02-03 21:42:07.202419056 -0500
@@ -36,7 +36,7 @@
[build_tools=$withval], [build_tools=yes])
AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ])
if test x$build_tools = xyes ; then
- PKG_CHECK_MODULES(png, "libpng12")
+ PKG_CHECK_MODULES(png, "libpng14")
fi
dnl --with-tests
|
