← Back to branch summary

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

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2011-03-08 15:32:48 UTC
  • mto: (1.3.2) (4.1.4 sid) (33.1.2 sid)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: james.westby@ubuntu.com-20110308153248-ay551yh4g1j7xcnk
Tags: upstream-2.23.1
Import upstream version 2.23.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
15
15
 
16
16
m4_define([gdk_pixbuf_major_version], [2])
17
17
m4_define([gdk_pixbuf_minor_version], [23])
18
 
m4_define([gdk_pixbuf_micro_version], [0])
19
 
m4_define([gdk_pixbuf_interface_age], [0])
 
18
m4_define([gdk_pixbuf_micro_version], [1])
 
19
m4_define([gdk_pixbuf_interface_age], [1])
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],
26
26
 
27
27
 
28
28
# required versions of other packages
29
 
m4_define([glib_required_version], [2.25.15])
 
29
m4_define([glib_required_version], [2.27.2])
30
30
 
31
31
AC_INIT([gdk-pixbuf], [gdk_pixbuf_version],
32
32
        [http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf],
519
519
AC_ARG_WITH(libjasper,
520
520
            [AC_HELP_STRING([--with-libjasper],
521
521
                            [enable JPEG2000 loader for gdk-pixbuf])])
522
 
 
523
 
AC_ARG_ENABLE(gdiplus,
524
 
            [AC_HELP_STRING([--enable-gdiplus],
525
 
                            [enble GDI+ loaders for gdk-pixbuf (currently known to be broken)])],,
526
 
            [enable_gdiplus=no])
527
 
 
528
 
AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$enable_gdiplus != xno ])
 
522
AC_ARG_WITH(gdiplus,
 
523
            [AC_HELP_STRING([--without-gdiplus],
 
524
                            [disable GDI+ loaders for gdk-pixbuf on Windows])])
 
525
 
 
526
AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$with_gdiplus != xno ])
529
527
 
530
528
dnl Test for libtiff
531
 
if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
 
529
if test x$os_win32 = xno || test x$with_gdiplus = xno; then
532
530
  if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
533
531
    AC_CHECK_LIB(tiff, TIFFReadRGBAImageOriented,
534
532
      [AC_CHECK_HEADER(tiffio.h,
554
552
fi
555
553
 
556
554
dnl Test for libjpeg
557
 
if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
 
555
if test x$os_win32 = xno || test x$with_gdiplus = xno; then
558
556
  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
559
557
    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
560
558
      jpeg_ok=yes,
686
684
if test x$with_libjasper = xyes; then
687
685
  all_loaders="$all_loaders,jasper"
688
686
fi
689
 
if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then
 
687
if test x$os_win32 = xyes && test x$with_gdiplus != xno; then
690
688
  # Skip PNG, see comment above
691
689
  gdip_formats="bmp emf gif ico jpeg tiff wmf"
692
690
  for f in $gdip_formats; do
899
897
AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
900
898
 
901
899
REBUILD_PNGS=
902
 
if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then
 
900
if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$with_gdiplus = xno; then
903
901
  REBUILD_PNGS=#
904
902
fi
905
903
 
1013
1011
                           enable_Bsymbolic=no)
1014
1012
               LDFLAGS="${SAVED_LDFLAGS}"])
1015
1013
 
1016
 
if test "x${enable_Bsymbolic}" == "xyes"; then
 
1014
if test "x${enable_Bsymbolic}" = "xyes"; then
1017
1015
  GDK_PIXBUF_LINK_FLAGS=-Wl,-Bsymbolic-functions
1018
1016
fi
1019
1017
 
1032
1030
gdk-pixbuf/gdk_pixbuf.rc
1033
1031
gdk-pixbuf/gdk-pixbuf-features.h
1034
1032
gdk-pixbuf/pixops/Makefile
 
1033
build/Makefile
 
1034
build/win32/Makefile
 
1035
build/win32/vs9/Makefile
 
1036
build/win32/vs10/Makefile
1035
1037
docs/Makefile
1036
1038
docs/reference/Makefile
1037
1039
docs/reference/gdk-pixbuf/Makefile
1041
1043
contrib/Makefile
1042
1044
contrib/gdk-pixbuf-xlib/Makefile
1043
1045
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
 
1046
config.h.win32
1044
1047
])
1045
1048
 
1046
1049
AC_OUTPUT