AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove accidentally committed mng stuff.

Browse Source
This commit is contained in:
Matthias Clasen 2002-05-16 21:49:16 +00:00
parent 100cde1ce6
commit 8afec72c8d
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configure.in
View File

@ -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. 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(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(libjpeg, [ --without-libjpeg disable JPEG loader for gdk-pixbuf])
AC_ARG_WITH(libtiff, [ --without-libtiff disable TIFF 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.]) *** from CVS.])
fi 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(LIBTIFF)
AC_SUBST(LIBJPEG) AC_SUBST(LIBJPEG)
AC_SUBST(LIBPNG) AC_SUBST(LIBPNG)
AC_SUBST(LIBMNG)
AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks) AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
@ -789,7 +766,7 @@ else
fi fi
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="" included_loaders=""
# If no loaders specified, include all # If no loaders specified, include all
if test "x$with_included_loaders" = xyes ; then 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_TIFF, test "x$LIBTIFF" != x)
AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != 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) AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
if $dynworks ; then if $dynworks ; then
@ -838,11 +814,8 @@ if $dynworks ; then
if echo "$included_loaders" | grep "\(^\|\,\)png\(\$\|\,\)" > /dev/null; then if echo "$included_loaders" | grep "\(^\|\,\)png\(\$\|\,\)" > /dev/null; then
STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
fi fi
if echo "$included_loaders" | grep "\(^\|\,\)mng\(\$\|\,\)" > /dev/null; then
STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBMNG"
fi
else else
STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBMNG" STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
fi fi
# Checks to see if we should compile in MMX support (there will be # Checks to see if we should compile in MMX support (there will be