diff options
| author | David Tardon <dtardon@redhat.com> | 2012-09-26 07:23:24 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-26 13:15:14 +0200 |
| commit | 6066151aa185d4df053185ff59efc1c8e869d34c (patch) | |
| tree | f4158f342e37ddea744ddc67217d3764f1cd0b84 | |
| parent | do not need to escape $ here (diff) | |
| download | core-6066151aa185d4df053185ff59efc1c8e869d34c.tar.gz core-6066151aa185d4df053185ff59efc1c8e869d34c.zip | |
return build conditional for libpng
Change-Id: I0ff1f219db136f3cc763d6af61df177831b1e93f
| -rw-r--r-- | cairo/prj/build.lst | 2 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | gdk-pixbuf/prj/build.lst | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst index 5827e76d25f5..b10763514f47 100644 --- a/cairo/prj/build.lst +++ b/cairo/prj/build.lst @@ -1,4 +1,4 @@ -lcairo cairo : ZLIB:zlib libpng soltools NULL +lcairo cairo : ZLIB:zlib LIBPNG:libpng soltools NULL lcairo cairo usr1 - all lcairo_mkout NULL lcairo cairo\pixman nmake - all lcairo_pixman NULL lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL diff --git a/configure.in b/configure.in index 3434f7483a18..66746a480b70 100644 --- a/configure.in +++ b/configure.in @@ -11595,6 +11595,7 @@ if test "$with_system_libpng" = yes; then AC_MSG_RESULT([yes]) else SYSTEM_LIBPNG=NO + BUILD_TYPE="$BUILD_TYPE LIBPNG" PNG_TARBALL=9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz AC_MSG_RESULT([no]) fi diff --git a/gdk-pixbuf/prj/build.lst b/gdk-pixbuf/prj/build.lst index 550466a7b9ed..db76c491a65a 100644 --- a/gdk-pixbuf/prj/build.lst +++ b/gdk-pixbuf/prj/build.lst @@ -1,3 +1,3 @@ -gp gdk-pixbuf : glib gettext jpeg libpng soltools NULL +gp gdk-pixbuf : glib gettext jpeg LIBPNG:libpng soltools NULL gp gdk-pixbuf usr1 - all gp_mkout NULL gp gdk-pixbuf nmake - all gp_gdk-pixbuf NULL |