diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2002-05-16 21:49:16 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2002-05-16 21:49:16 +0000 |
| commit | 8afec72c8d0cee7fb5ccb4c07e99f8eccdcace68 (patch) | |
| tree | 54daafe695c676c749bb08c519e1df4e8d2b1d5b /configure.in | |
| parent | 100cde1ce696e70fe9dbdce6c25a0692aa210cc9 (diff) | |
| download | gtk+-8afec72c8d0cee7fb5ccb4c07e99f8eccdcace68.tar.gz | |
Remove accidentally committed mng stuff.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/configure.in b/configure.in index 614e7968e0..cf4338e07b 100644 --- a/configure.in +++ b/configure.in @@ -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 |