From 043ffccc913a22f457e6330a2dcfd4366c837dde Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 24 Mar 2009 16:35:01 +0000 Subject: [PATCH] avoid png & zlib makefiles when libpng is enabled svn: r14248 --- src/configure | 6 +++++- src/mzscheme/configure.ac | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/configure b/src/configure index 715a606311..ae2482e643 100755 --- a/src/configure +++ b/src/configure @@ -12014,8 +12014,12 @@ if test "${enable_mred}" = "yes" ; then makefiles="$makefiles mred/Makefile mred/wxs/Makefile mred/wxme/Makefile - mred/gc2/Makefile + mred/gc2/Makefile" + + if test "${enable_libpng}" != "yes" ; then + makefiles="$makefiles wxcommon/libpng/Makefile wxcommon/zlib/Makefile" + fi if test "${enable_quartz}" = "yes" ; then makefiles="$makefiles diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac index 55c680a812..87af1f2b53 100644 --- a/src/mzscheme/configure.ac +++ b/src/mzscheme/configure.ac @@ -1453,8 +1453,12 @@ if test "${enable_mred}" = "yes" ; then makefiles="$makefiles mred/Makefile mred/wxs/Makefile mred/wxme/Makefile - mred/gc2/Makefile + mred/gc2/Makefile" + + if test "${enable_libpng}" != "yes" ; then + makefiles="$makefiles wxcommon/libpng/Makefile wxcommon/zlib/Makefile" + fi if test "${enable_quartz}" = "yes" ; then makefiles="$makefiles