Commit 8afec72c authored by Matthias Clasen's avatar Matthias Clasen

Remove accidentally committed mng stuff.

parent 100cde1c
......@@ -641,7 +641,6 @@ dnl We allow people to disable image loaders explicitely, but if they don't we e
dnl out so that people don't accidentally build without them.
AC_ARG_WITH(libpng, [ --without-libpng disable PNG loader for gdk-pixbuf])
AC_ARG_WITH(libmng, [ --without-libmng disable MNG loader for gdk-pixbuf])
AC_ARG_WITH(libjpeg, [ --without-libjpeg disable JPEG loader for gdk-pixbuf])
AC_ARG_WITH(libtiff, [ --without-libtiff disable TIFF loader for gdk-pixbuf])
......@@ -745,31 +744,9 @@ dnl Test for libpng
*** from CVS.])
fi
dnl Test for libmng
if test x$with_libmng != xno && test -z "$LIBMNG"; then
AC_CHECK_LIB(mng, mng_initialize,
[AC_CHECK_HEADER(libmng.h,
mng_ok=yes,
mng_ok=no)],
AC_MSG_WARN(*** MNG loader will not be built (MNG library not found) ***), -lz -lm)
AC_MSG_RESULT($mng_ok)
if test "$mng_ok" = yes; then
MNG='mng'; LIBMNG='-lmng -lz'
else
AC_MSG_WARN(*** MNG loader will not be built (MNG header file not found) ***)
fi
fi
REBUILD_PNGS=\#
if test -z "$LIBPNG"; then
REBUILD_PNGS=
fi
AC_SUBST(REBUILD_PNGS)
AC_SUBST(LIBTIFF)
AC_SUBST(LIBJPEG)
AC_SUBST(LIBPNG)
AC_SUBST(LIBMNG)
AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
......@@ -789,7 +766,7 @@ else
fi
fi
all_loaders="png,mng,bmp,wbmp,gif,ico,jpeg,pnm,ras,tiff,xpm,tga"
all_loaders="png,bmp,wbmp,gif,ico,jpeg,pnm,ras,tiff,xpm,tga"
included_loaders=""
# If no loaders specified, include all
if test "x$with_included_loaders" = xyes ; then
......@@ -824,7 +801,6 @@ AC_TYPE_SIGNAL
AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
AM_CONDITIONAL(HAVE_MNG, test "x$LIBMNG" != x)
AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
if $dynworks ; then
......@@ -838,11 +814,8 @@ if $dynworks ; then
if echo "$included_loaders" | grep "\(^\|\,\)png\(\$\|\,\)" > /dev/null; then
STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
fi
if echo "$included_loaders" | grep "\(^\|\,\)mng\(\$\|\,\)" > /dev/null; then
STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBMNG"
fi
else
STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBMNG"
STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
fi
# Checks to see if we should compile in MMX support (there will be
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment