| author | Tomas Klacko <tomas.klacko@oracle.com> |
| Tue, 19 Jun 2012 02:04:06 -0700 | |
| branch | s11-sru |
| changeset 2292 | 7fe16a6a2bde |
| parent 130 | 5e67396e42dc |
| permissions | -rw-r--r-- |
|
130
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
# remove searching for libpng12 first since we want the default libpng. |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
# see 6989480 |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
|
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
--- configure.ac.orig Sun Mar 13 21:09:25 2011 |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
+++ configure.ac Sun Mar 13 21:10:10 2011 |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
@@ -350,14 +350,8 @@ |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
# authors decide to do this AGAIN. Which I really hope they won't. TBB |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
|
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
if test "$withval" != no; then |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
- AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config]) |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config]) |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
- if test -n "$LIBPNG12_CONFIG"; then |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
- libpng_CPPFLAGS=`libpng12-config --cflags` |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
- # should be --ldopts, but it's currently broken |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
- libpng_LDFLAGS=`libpng12-config --ldflags` |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
- libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'` |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
- elif test -n "$LIBPNG_CONFIG"; then |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
+ if test -n "$LIBPNG_CONFIG"; then |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
libpng_CPPFLAGS=`libpng-config --cflags` |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
# should be --ldopts, but it's currently broken |
|
5e67396e42dc
7008376 CVE-2009-3546 Upgrade GD
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
libpng_LDFLAGS=`libpng-config --ldflags` |