← Back to branch summary

~ubuntu-branches/ubuntu/precise/gdk-pixbuf/precise

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-09-02 12:05:31 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: package-import@ubuntu.com-20110902120531-m8ps135i9wx0wu9c
Tags: 2.24.0-1
New upstream bug fix release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
14
14
#   gdk_pixbuf_binary_age = 0;
15
15
 
16
16
m4_define([gdk_pixbuf_major_version], [2])
17
 
m4_define([gdk_pixbuf_minor_version], [23])
18
 
m4_define([gdk_pixbuf_micro_version], [5])
19
 
m4_define([gdk_pixbuf_interface_age], [5])
 
17
m4_define([gdk_pixbuf_minor_version], [24])
 
18
m4_define([gdk_pixbuf_micro_version], [0])
 
19
m4_define([gdk_pixbuf_interface_age], [0])
20
20
m4_define([gdk_pixbuf_binary_age],
21
21
          [m4_eval(100 * gdk_pixbuf_minor_version + gdk_pixbuf_micro_version)])
22
22
m4_define([gdk_pixbuf_version],
591
591
 
592
592
dnl Test for libpng
593
593
  if test x$with_libpng != xno && test -z "$LIBPNG"; then
594
 
    for l in libpng libpng14 libpng12 libpng13 libpng10 ; do
 
594
    for l in libpng15 libpng14 libpng12 libpng13 libpng10 libpng ; do
595
595
      AC_MSG_CHECKING(for $l)
596
596
      if $PKG_CONFIG --exists $l ; then
597
597
        AC_MSG_RESULT(yes)
814
814
    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
815
815
  fi
816
816
  if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
817
 
    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
 
817
    if test -z $PNG_DEP_CFLAGS_PACKAGES; then
 
818
      STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
 
819
    fi
818
820
  fi
819
821
  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
820
822
    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
916
918
GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
917
919
GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
918
920
GDK_PIXBUF_EXTRA_CFLAGS=
919
 
GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 
921
GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
920
922
GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
921
923
 
922
924
AC_SUBST(PNG_DEP_CFLAGS_PACKAGES)