Attachment #87452 for bug #133826




AC_SUBST(GDK_PIXBUF_MINOR)
AC_SUBST(GDK_PIXBUF_MICRO)
AC_SUBST(GDK_PIXBUF_VERSION)
AC_PROG_LIBTOOL

AC_PROG_CC
AC_ISC_POSIX

STRIP_BEGIN=
STRIP_END=
if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
    STRIP_BEGIN='$(strip $(STRIP_DUMMY)'
    STRIP_END=')'
    AC_MSG_RESULT(yes)
else
    AC_MSG_RESULT(no)
fi
STRIP_DUMMY=
AC_SUBST(STRIP_DUMMY)

AC_SUBST(STRIP_END)

AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
if test "x$GNOME_CONFIG" != "xno"; then
    echo "Building the GnomeCanvasPixbuf library"
    GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui`
    GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui`
    BUILD_CANVAS="yes"
else
    echo "Not building GnomeCanvasPixbuf library"
    BUILD_CANVAS="no"
fi       

AM_CONDITIONAL(BUILD_CANVAS_ITEM, test "$BUILD_CANVAS" = "yes")

AC_SUBST(GNOME_LIBS)
AC_SUBST(GNOME_CFLAGS)

AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)

AC_ARG_ENABLE(modules, [  --disable-modules       Disables dynamic module loading],[
    if test "x$withval" = "xyes"; then 
        with_modules="yes"
        else
            with_modules="no"
    fi
])

dynworks=false
deps=
if test "x$with_modules" = "xno"; then
    AC_MSG_RESULT(no)
else
    AC_MSG_RESULT(yes)

    #include <gmodule.h>
    main ()
    {
        if (g_module_supported ())
            exit (0);
        else
            exit (1);
    }
    ], dynworks="true")
    LIBS="$oLIBS"
    CFLAGS="$oCFLAGS"
fi
    
dnl Now we check to see if our libtool supports shared lib deps
dnl (in a rather ugly way even)
if test "$dynworks" = "true"; then
   pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config"
   pixbuf_deplibs_check=`$pixbuf_libtool_config | \
      grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \

   if test "x$pixbuf_deplibs_check" = "xnone" || \
      test "x$pixbuf_deplibs_check" = "xunknown" || \
      test "x$pixbuf_deplibs_check" = "x"; then
      dynworks="false"
   fi
fi

if test "$dynworks" = "true"; then
   AC_DEFINE(USE_GMODULE)
   GMODULE_LIBS="`glib-config --libs gmodule`"
   GMODULE_FLAGS="`glib-config --cflags gmodule`"

AC_MSG_RESULT([$path_rgb_txt])
AC_DEFINE_UNQUOTED(PATH_RGB_TXT,"$path_rgb_txt")

if test -z "$LIBTIFF"; then
  AC_CHECK_LIB(tiff, TIFFReadScanline,
    [AC_CHECK_HEADER(tiffio.h,
      TIFF="tiff"
      LIBTIFF="-ltiff",
      AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
    [AC_CHECK_LIB(tiff, TIFFWriteScanline,
      [AC_CHECK_HEADER(tiffio.h,
        TIFF="tiff"
        LIBTIFF="-ltiff -ljpeg -lz",
        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
      [AC_CHECK_LIB(tiff34, TIFFFlushData,
        [AC_CHECK_HEADER(tiffio.h,
          TIFF="tiff"
          LIBTIFF="-ltiff34 -ljpeg -lz",
          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
      AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***),
      -ljpeg -lz -lm)],
    -ljpeg -lz -lm)],
  -lm)
fi

dnl Test for libjpeg
if test -z "$LIBJPEG"; then
  AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
    [AC_CHECK_HEADER(jpeglib.h,
      [LIBJPEG="-ljpeg"
      AC_CHECK_LIB(jpeg,jpeg_simple_progression,       
      AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
      AC_MSG_WARN(JPEG library does not support progressive saving.))],
    AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***))],
  AC_MSG_WARN(*** JPEG loader will not be built (JPEG library not found) ***))
fi
#undef VERSION
#include <jpeglib.h>],
        jpeg_ok=yes,
        jpeg_ok=no)
      AC_MSG_RESULT($jpeg_ok)
      if test "$jpeg_ok" = yes; then
        LIBJPEG='-ljpeg'
        AC_CHECK_LIB(jpeg, jpeg_simple_progression,     
          AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
          AC_MSG_WARN(JPEG library does not support progressive saving.))
      else
          AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
      fi
    fi
  fi

dnl Test for libpng
if test -z "$LIBPNG"; then
   AC_CHECK_LIB(png, png_read_info,
    [AC_CHECK_HEADER(png.h,
      png_ok="yes",
      png_ok="no")],
    AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
  if test "$png_ok" = "yes"; then
    AC_MSG_CHECKING([for png_structp in png.h])
    AC_TRY_COMPILE([#include <png.h>
      ],[png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
      png_ok="yes",
      png_ok="no")
    AC_MSG_RESULT($png_ok)
    if test "$png_ok" = "yes"; then
      PNG="png"
      LIBPNG="-lpng -lz"
        AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
      fi
    else
      AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
    fi
  else
    AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
  fi
fi

deps="$LIBTIFF $LIBJPEG $LIBPNG"



AC_TYPE_SIGNAL

AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != "x")
AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != "x")
AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != "x")

GDK_PIXBUF_LIBDIR='-L${libdir}'
GDK_PIXBUF_INCLUDEDIR="-I${includedir}/gdk-pixbuf-1.0 $GTK_CFLAGS"

if test "x$with_html_dir" = "x" ; then
  HTML_DIR='${datadir}/gnome/html'
else
  HTML_DIR="$with_html_dir"
fi

AC_SUBST(HTML_DIR)

AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)

gtk_doc_min_version=0.6
if test "$GTKDOC" = "true" ; then 
    gtk_doc_version=`gtkdoc-mkdb --version`
    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
    if perl <<EOF ; then

      AC_MSG_RESULT(yes)
   else
      AC_MSG_RESULT(no)
      GTKDOC="false"
   fi
fi


dnl Let people disable the gtk-doc stuff.
AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)

if test "x$enable_gtk_doc" = "xauto" ; then
  if test "x$GTKDOC" = "xtrue" ; then
    enable_gtk_doc="yes"
  else
    enable_gtk_doc="no" 
  fi
fi

dnl NOTE: We need to use a separate automake conditional for this
dnl       to make this work with the tarballs.
AM_CONDITIONAL(ENABLE_GTK_DOC, test "x$enable_gtk_doc" = "xyes")

#
# Checks to see if we should compile in MMX support (there will be

AC_MSG_CHECKING(for x86 platform)
  case $host_cpu in
    i386|i486|i586|i686|i786|k6|k7)
    use_x86_asm="yes"
    ;;
    *)
    use_x86_asm="no"
  esac
AC_MSG_RESULT($use_x86_asm)

dnl Are we going to use MMX extensions
use_mmx_asm="no"

AC_MSG_CHECKING(compiler support for MMX)

if test "x$enable_mmx" = "xauto" ; then
  if test "$use_x86_asm" = "yes"; then
    save_ac_ext="$ac_ext"
    ac_ext="S"
    
    cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
    if AC_TRY_EVAL(ac_compile); then
        use_mmx_asm="yes"
    fi
    dnl rm -f conftest.[oS]

    ac_ext="$save_ac_ext"
  fi

dnl Enforce usage of MMX extensions
elif test "x$enable_mmx" = "xyes" ; then
    use_mmx_asm="yes"
else
    use_mmx_asm="no"
fi

if test "$use_mmx_asm" = "yes"; then
  AC_DEFINE(USE_MMX)
  AC_MSG_RESULT(yes)
else
  AC_MSG_RESULT(no)
fi

AM_CONDITIONAL(USE_MMX, test "x$use_mmx_asm" = "xyes")

# Output files


Lines 16-21 Link Here

(-)gdk-pixbuf-0.22.0/gdk-pixbuf/Makefile.am.orig (+2 lines)
16	libgdk_pixbuf_xlib.la \	16	libgdk_pixbuf_xlib.la \
17	$(CANVAS_PIXBUF_LIB)	17	$(CANVAS_PIXBUF_LIB)
18		18
		19	libgnomecanvaspixbuf_la_DEPENDENCIES = libgdk_pixbuf.la
19	libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS)	20	libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS)
20	libgnomecanvaspixbuf_la_LIBADD = libgdk_pixbuf.la	21	libgnomecanvaspixbuf_la_LIBADD = libgdk_pixbuf.la
21		22
Lines 191-196 Link Here
191	gdk-pixbuf-parse-color.c \	192	gdk-pixbuf-parse-color.c \
192	$(extra_sources)	193	$(extra_sources)
193		194
		195	libgdk_pixbuf_xlib_la_DEPENDENCIES = pixops/libpixops.la libgdk_pixbuf.la
194	libgdk_pixbuf_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(GTK_LIBS)	196	libgdk_pixbuf_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(GTK_LIBS)
195	libgdk_pixbuf_la_LIBADD = pixops/libpixops.la	197	libgdk_pixbuf_la_LIBADD = pixops/libpixops.la
196		198

Return to bug 133826

Lines 16-22 Link Here

(-)gdk-pixbuf-0.22.0/configure.in.orig (-112 / +103 lines)
16	AC_SUBST(GDK_PIXBUF_MINOR)	16	AC_SUBST(GDK_PIXBUF_MINOR)
17	AC_SUBST(GDK_PIXBUF_MICRO)	17	AC_SUBST(GDK_PIXBUF_MICRO)
18	AC_SUBST(GDK_PIXBUF_VERSION)	18	AC_SUBST(GDK_PIXBUF_VERSION)
19	AM_PROG_LIBTOOL	19	AC_PROG_LIBTOOL
20		20
21	AC_PROG_CC	21	AC_PROG_CC
22	AC_ISC_POSIX	22	AC_ISC_POSIX
Lines 37-47 Link Here
37	STRIP_BEGIN=	37	STRIP_BEGIN=
38	STRIP_END=	38	STRIP_END=
39	if $ac_make --version 2>/dev/null \| grep '^GNU Make ' >/dev/null ; then	39	if $ac_make --version 2>/dev/null \| grep '^GNU Make ' >/dev/null ; then
40	STRIP_BEGIN='$(strip $(STRIP_DUMMY)'	40	STRIP_BEGIN='$(strip $(STRIP_DUMMY)'
41	STRIP_END=')'	41	STRIP_END=')'
42	AC_MSG_RESULT(yes)	42	AC_MSG_RESULT(yes)
43	else	43	else
44	AC_MSG_RESULT(no)	44	AC_MSG_RESULT(no)
45	fi	45	fi
46	STRIP_DUMMY=	46	STRIP_DUMMY=
47	AC_SUBST(STRIP_DUMMY)	47	AC_SUBST(STRIP_DUMMY)
Lines 49-65 Link Here
49	AC_SUBST(STRIP_END)	49	AC_SUBST(STRIP_END)
50		50
51	AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)	51	AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
52	if test x$GNOME_CONFIG != xno; then	52	if test "x$GNOME_CONFIG" != "xno"; then
53	echo "Building the GnomeCanvasPixbuf library"	53	echo "Building the GnomeCanvasPixbuf library"
54	GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui`	54	GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui`
55	GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui`	55	GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui`
56	BUILD_CANVAS=yes	56	BUILD_CANVAS="yes"
57	else	57	else
58	echo "Not building GnomeCanvasPixbuf library"	58	echo "Not building GnomeCanvasPixbuf library"
59	BUILD_CANVAS=no	59	BUILD_CANVAS="no"
60	fi	60	fi
61		61
62	AM_CONDITIONAL(BUILD_CANVAS_ITEM, test $BUILD_CANVAS = yes)	62	AM_CONDITIONAL(BUILD_CANVAS_ITEM, test "$BUILD_CANVAS" = "yes")
63		63
64	AC_SUBST(GNOME_LIBS)	64	AC_SUBST(GNOME_LIBS)
65	AC_SUBST(GNOME_CFLAGS)	65	AC_SUBST(GNOME_CFLAGS)
Lines 67-82 Link Here
67	AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)	67	AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)
68		68
69	AC_ARG_ENABLE(modules, [ --disable-modules Disables dynamic module loading],[	69	AC_ARG_ENABLE(modules, [ --disable-modules Disables dynamic module loading],[
70	if test x$withval = xyes; then	70	if test "x$withval" = "xyes"; then
71	with_modules=yes	71	with_modules="yes"
72	else	72	else
73	with_modules=no	73	with_modules="no"
74	fi	74	fi
75	])	75	])
76		76
77	dynworks=false	77	dynworks=false
78	deps=	78	deps=
79	if test x$with_modules = xno; then	79	if test "x$with_modules" = "xno"; then
80	AC_MSG_RESULT(no)	80	AC_MSG_RESULT(no)
81	else	81	else
82	AC_MSG_RESULT(yes)	82	AC_MSG_RESULT(yes)
Lines 90-108 Link Here
90	#include <gmodule.h>	90	#include <gmodule.h>
91	main ()	91	main ()
92	{	92	{
93	if (g_module_supported ())	93	if (g_module_supported ())
94	exit (0);	94	exit (0);
95	else	95	else
96	exit (1);	96	exit (1);
97	}	97	}
98	], dynworks=true)	98	], dynworks="true")
99	LIBS="$oLIBS"	99	LIBS="$oLIBS"
100	CFLAGS="$oCFLAGS"	100	CFLAGS="$oCFLAGS"
101	fi	101	fi
102		102
103	dnl Now we check to see if our libtool supports shared lib deps	103	dnl Now we check to see if our libtool supports shared lib deps
104	dnl (in a rather ugly way even)	104	dnl (in a rather ugly way even)
105	if $dynworks; then	105	if test "$dynworks" = "true"; then
106	pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config"	106	pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config"
107	pixbuf_deplibs_check=`$pixbuf_libtool_config \| \	107	pixbuf_deplibs_check=`$pixbuf_libtool_config \| \
108	grep '^[[a-z_]]check[[a-z_]]_method=[['\''"]]' \| \	108	grep '^[[a-z_]]check[[a-z_]]_method=[['\''"]]' \| \
Lines 110-120 Link Here
110	if test "x$pixbuf_deplibs_check" = "xnone" \|\| \	110	if test "x$pixbuf_deplibs_check" = "xnone" \|\| \
111	test "x$pixbuf_deplibs_check" = "xunknown" \|\| \	111	test "x$pixbuf_deplibs_check" = "xunknown" \|\| \
112	test "x$pixbuf_deplibs_check" = "x"; then	112	test "x$pixbuf_deplibs_check" = "x"; then
113	dynworks=false	113	dynworks="false"
114	fi	114	fi
115	fi	115	fi
116		116
117	if $dynworks; then	117	if test "$dynworks" = "true"; then
118	AC_DEFINE(USE_GMODULE)	118	AC_DEFINE(USE_GMODULE)
119	GMODULE_LIBS="`glib-config --libs gmodule`"	119	GMODULE_LIBS="`glib-config --libs gmodule`"
120	GMODULE_FLAGS="`glib-config --cflags gmodule`"	120	GMODULE_FLAGS="`glib-config --cflags gmodule`"
Lines 144-216 Link Here
144	AC_MSG_RESULT([$path_rgb_txt])	144	AC_MSG_RESULT([$path_rgb_txt])
145	AC_DEFINE_UNQUOTED(PATH_RGB_TXT,"$path_rgb_txt")	145	AC_DEFINE_UNQUOTED(PATH_RGB_TXT,"$path_rgb_txt")
146		146
147	dnl Test for libtiff	147	if test -z "$LIBTIFF"; then
148	if test -z "$LIBTIFF"; then	148	AC_CHECK_LIB(tiff, TIFFReadScanline,
149	AC_CHECK_LIB(tiff, TIFFReadScanline,	149	[AC_CHECK_HEADER(tiffio.h,
150	AC_CHECK_HEADER(tiffio.h,	150	TIFF="tiff"
151	TIFF='tiff'; LIBTIFF='-ltiff',	151	LIBTIFF="-ltiff",
152	AC_MSG_WARN(* TIFF loader will not be built (TIFF header files not found) *)),	152	AC_MSG_WARN(* TIFF loader will not be built (TIFF header files not found) *))],
153	AC_CHECK_LIB(tiff, TIFFWriteScanline,	153	[AC_CHECK_LIB(tiff, TIFFWriteScanline,
154	AC_CHECK_HEADER(tiffio.h,	154	[AC_CHECK_HEADER(tiffio.h,
155	TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',	155	TIFF="tiff"
156	AC_MSG_WARN(* TIFF loader will not be built (TIFF header files not found) *)),	156	LIBTIFF="-ltiff -ljpeg -lz",
157	AC_CHECK_LIB(tiff34, TIFFFlushData,	157	AC_MSG_WARN(* TIFF loader will not be built (TIFF header files not found) *))],
158	AC_CHECK_HEADER(tiffio.h,	158	[AC_CHECK_LIB(tiff34, TIFFFlushData,
159	TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',	159	[AC_CHECK_HEADER(tiffio.h,
160	AC_MSG_WARN(* TIFF loader will not be built (TIFF header files not found) *)),	160	TIFF="tiff"
161	AC_MSG_WARN(* TIFF plug-in will not be built (TIFF library not found) *), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)	161	LIBTIFF="-ltiff34 -ljpeg -lz",
162	fi	162	AC_MSG_WARN(* TIFF loader will not be built (TIFF header files not found) *))],
		163	AC_MSG_WARN(* TIFF plug-in will not be built (TIFF library not found) *),
		164	-ljpeg -lz -lm)],
		165	-ljpeg -lz -lm)],
		166	-lm)
		167	fi
163		168
164	dnl Test for libjpeg	169	dnl Test for libjpeg
165	if test -z "$LIBJPEG"; then	170	if test -z "$LIBJPEG"; then
166	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,	171	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
167	jpeg_ok=yes,	172	[AC_CHECK_HEADER(jpeglib.h,
168	jpeg_ok=no	173	[LIBJPEG="-ljpeg"
169	AC_MSG_WARN(* JPEG loader will not be built (JPEG library not found) *))	174	AC_CHECK_LIB(jpeg,jpeg_simple_progression,
170	if test "$jpeg_ok" = yes; then	175	AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
171	AC_MSG_CHECKING([for jpeglib.h])	176	AC_MSG_WARN(JPEG library does not support progressive saving.))],
172	AC_TRY_CPP(	177	AC_MSG_WARN(* JPEG loader will not be built (JPEG header file not found) *))],
173	[#include <stdio.h>	178	AC_MSG_WARN(* JPEG loader will not be built (JPEG library not found) *))
174	#undef PACKAGE	179	fi
175	#undef VERSION
176	#include <jpeglib.h>],
177	jpeg_ok=yes,
178	jpeg_ok=no)
179	AC_MSG_RESULT($jpeg_ok)
180	if test "$jpeg_ok" = yes; then
181	LIBJPEG='-ljpeg'
182	AC_CHECK_LIB(jpeg, jpeg_simple_progression,
183	AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
184	AC_MSG_WARN(JPEG library does not support progressive saving.))
185	else
186	AC_MSG_WARN(* JPEG loader will not be built (JPEG header file not found) *)
187	fi
188	fi
189	fi
190		180
191	dnl Test for libpng	181	dnl Test for libpng
192	if test -z "$LIBPNG"; then	182	if test -z "$LIBPNG"; then
193	AC_CHECK_LIB(png, png_read_info,	183	AC_CHECK_LIB(png, png_read_info,
194	AC_CHECK_HEADER(png.h,	184	[AC_CHECK_HEADER(png.h,
195	png_ok=yes,	185	png_ok="yes",
196	png_ok=no),	186	png_ok="no")],
197	AC_MSG_WARN(* PNG loader will not be built (PNG library not found) *), -lz -lm)	187	AC_MSG_WARN(* PNG loader will not be built (PNG library not found) *), -lz -lm)
198	if test "$png_ok" = yes; then	188	if test "$png_ok" = "yes"; then
199	AC_MSG_CHECKING([for png_structp in png.h])	189	AC_MSG_CHECKING([for png_structp in png.h])
200	AC_TRY_COMPILE([#include <png.h>],	190	AC_TRY_COMPILE([#include <png.h>
201	[png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],	191	],[png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
202	png_ok=yes,	192	png_ok="yes",
203	png_ok=no)	193	png_ok="no")
204	AC_MSG_RESULT($png_ok)	194	AC_MSG_RESULT($png_ok)
205	if test "$png_ok" = yes; then	195	if test "$png_ok" = "yes"; then
206	PNG='png'; LIBPNG='-lpng -lz'	196	PNG="png"
207	else	197	LIBPNG="-lpng -lz"
208	AC_MSG_WARN(* PNG loader will not be built (PNG library is too old) *)
209	fi
210	else	198	else
211	AC_MSG_WARN(* PNG loader will not be built (PNG header file not found) *)	199	AC_MSG_WARN(* PNG loader will not be built (PNG library is too old) *)
212	fi	200	fi
		201	else
		202	AC_MSG_WARN(* PNG loader will not be built (PNG header file not found) *)
213	fi	203	fi
		204	fi
214		205
215	deps="$LIBTIFF $LIBJPEG $LIBPNG"	206	deps="$LIBTIFF $LIBJPEG $LIBPNG"
216		207
Lines 226-234 Link Here
226		217
227	AC_TYPE_SIGNAL	218	AC_TYPE_SIGNAL
228		219
229	AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)	220	AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != "x")
230	AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)	221	AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != "x")
231	AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)	222	AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != "x")
232		223
233	GDK_PIXBUF_LIBDIR='-L${libdir}'	224	GDK_PIXBUF_LIBDIR='-L${libdir}'
234	GDK_PIXBUF_INCLUDEDIR="-I${includedir}/gdk-pixbuf-1.0 $GTK_CFLAGS"	225	GDK_PIXBUF_INCLUDEDIR="-I${includedir}/gdk-pixbuf-1.0 $GTK_CFLAGS"
Lines 265-271 Link Here
265	if test "x$with_html_dir" = "x" ; then	256	if test "x$with_html_dir" = "x" ; then
266	HTML_DIR='${datadir}/gnome/html'	257	HTML_DIR='${datadir}/gnome/html'
267	else	258	else
268	HTML_DIR=$with_html_dir	259	HTML_DIR="$with_html_dir"
269	fi	260	fi
270		261
271	AC_SUBST(HTML_DIR)	262	AC_SUBST(HTML_DIR)
Lines 273-279 Link Here
273	AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)	264	AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
274		265
275	gtk_doc_min_version=0.6	266	gtk_doc_min_version=0.6
276	if $GTKDOC ; then	267	if test "$GTKDOC" = "true" ; then
277	gtk_doc_version=`gtkdoc-mkdb --version`	268	gtk_doc_version=`gtkdoc-mkdb --version`
278	AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])	269	AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
279	if perl <<EOF ; then	270	if perl <<EOF ; then
Lines 283-289 Link Here
283	AC_MSG_RESULT(yes)	274	AC_MSG_RESULT(yes)
284	else	275	else
285	AC_MSG_RESULT(no)	276	AC_MSG_RESULT(no)
286	GTKDOC=false	277	GTKDOC="false"
287	fi	278	fi
288	fi	279	fi
289		280
Lines 296-312 Link Here
296	dnl Let people disable the gtk-doc stuff.	287	dnl Let people disable the gtk-doc stuff.
297	AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)	288	AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
298		289
299	if test x$enable_gtk_doc = xauto ; then	290	if test "x$enable_gtk_doc" = "xauto" ; then
300	if test x$GTKDOC = xtrue ; then	291	if test "x$GTKDOC" = "xtrue" ; then
301	enable_gtk_doc=yes	292	enable_gtk_doc="yes"
302	else	293	else
303	enable_gtk_doc=no	294	enable_gtk_doc="no"
304	fi	295	fi
305	fi	296	fi
306		297
307	dnl NOTE: We need to use a separate automake conditional for this	298	dnl NOTE: We need to use a separate automake conditional for this
308	dnl to make this work with the tarballs.	299	dnl to make this work with the tarballs.
309	AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)	300	AM_CONDITIONAL(ENABLE_GTK_DOC, test "x$enable_gtk_doc" = "xyes")
310		301
311	#	302	#
312	# Checks to see if we should compile in MMX support (there will be	303	# Checks to see if we should compile in MMX support (there will be
Lines 321-367 Link Here
321	AC_MSG_CHECKING(for x86 platform)	312	AC_MSG_CHECKING(for x86 platform)
322	case $host_cpu in	313	case $host_cpu in
323	i386\|i486\|i586\|i686\|i786\|k6\|k7)	314	i386\|i486\|i586\|i686\|i786\|k6\|k7)
324	use_x86_asm=yes	315	use_x86_asm="yes"
325	;;	316	;;
326	*)	317	*)
327	use_x86_asm=no	318	use_x86_asm="no"
328	esac	319	esac
329	AC_MSG_RESULT($use_x86_asm)	320	AC_MSG_RESULT($use_x86_asm)
330		321
331	dnl Are we going to use MMX extensions	322	dnl Are we going to use MMX extensions
332	use_mmx_asm=no	323	use_mmx_asm="no"
333		324
334	AC_MSG_CHECKING(compiler support for MMX)	325	AC_MSG_CHECKING(compiler support for MMX)
335		326
336	if test x$enable_mmx = xauto ; then	327	if test "x$enable_mmx" = "xauto" ; then
337	if test $use_x86_asm = yes; then	328	if test "$use_x86_asm" = "yes"; then
338	save_ac_ext=$ac_ext	329	save_ac_ext="$ac_ext"
339	ac_ext=S	330	ac_ext="S"
340		331
341	cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S	332	cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
342	if AC_TRY_EVAL(ac_compile); then	333	if AC_TRY_EVAL(ac_compile); then
343	use_mmx_asm=yes	334	use_mmx_asm="yes"
344	fi	335	fi
345	dnl rm -f conftest.[oS]	336	dnl rm -f conftest.[oS]
346		337
347	ac_ext=$save_ac_ext	338	ac_ext="$save_ac_ext"
348	fi	339	fi
349		340
350	dnl Enforce usage of MMX extensions	341	dnl Enforce usage of MMX extensions
351	elif test x$enable_mmx = xyes ; then	342	elif test "x$enable_mmx" = "xyes" ; then
352	use_mmx_asm=yes	343	use_mmx_asm="yes"
353	else	344	else
354	use_mmx_asm=no	345	use_mmx_asm="no"
355	fi	346	fi
356		347
357	if test $use_mmx_asm = yes; then	348	if test "$use_mmx_asm" = "yes"; then
358	AC_DEFINE(USE_MMX)	349	AC_DEFINE(USE_MMX)
359	AC_MSG_RESULT(yes)	350	AC_MSG_RESULT(yes)
360	else	351	else
361	AC_MSG_RESULT(no)	352	AC_MSG_RESULT(no)
362	fi	353	fi
363		354
364	AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)	355	AM_CONDITIONAL(USE_MMX, test "x$use_mmx_asm" = "xyes")
365		356
366	# Output files	357	# Output files
367		358