suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better configure reporting when X11 headers/libs missing

Browse Source 
svn: r2295
This commit is contained in:
Matthew Flatt 2006-02-21 22:26:23 +00:00
parent 3a5744bbb2
commit 2672122c8b
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/configure vendored
View File

@ -5037,16 +5037,6 @@ if test "${enable_dynlib}" = "no" ; then
enable_shared=no
fi
if test "${enable_mred}" = "no" ; then
enable_wbuild=no
enable_xrender=no
enable_cairo=no
enable_libpng=no
enable_libjpeg=no
enable_gl=no
enable_pthread=no
fi
enable_quartz=no
if test "${enable_xonx}" = "yes" ; then
enable_quartz=no
@ -5101,6 +5091,16 @@ if test "${enable_mred}" = "yes" ; then
fi
fi
if test "${enable_mred}" = "no" ; then
enable_wbuild=no
enable_xrender=no
enable_cairo=no
enable_libpng=no
enable_libjpeg=no
enable_gl=no
enable_pthread=no
fi
###### Some defaults #######
OPTIONS=
@ -8291,6 +8291,15 @@ fi
fi
if test "${no_x}" = "yes" ; then
echo "***************************************************"
echo "configure: cannot find X11 headers and/or libraries,"
echo " which are needed for MrEd"
echo "To build just MzScheme, configure with --disable-mred"
echo "***************************************************"
echo configure aborted
exit 1
fi
fi
MAKE_MRED=mr
@ -12684,4 +12693,3 @@ echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
done
fi

30
src/mzscheme/configure.ac
View File

@ -102,16 +102,6 @@ if test "${enable_dynlib}" = "no" ; then
enable_shared=no
fi
if test "${enable_mred}" = "no" ; then
enable_wbuild=no
enable_xrender=no
enable_cairo=no
enable_libpng=no
enable_libjpeg=no
enable_gl=no
enable_pthread=no
fi
enable_quartz=no
if test "${enable_xonx}" = "yes" ; then
enable_quartz=no
@ -166,6 +156,16 @@ if test "${enable_mred}" = "yes" ; then
fi
fi
if test "${enable_mred}" = "no" ; then
enable_wbuild=no
enable_xrender=no
enable_cairo=no
enable_libpng=no
enable_libjpeg=no
enable_gl=no
enable_pthread=no
fi
###### Some defaults #######
OPTIONS=
@ -304,6 +304,15 @@ if test "${enable_mred}" = "yes" ; then
:
else
AC_PATH_XTRA
if test "${no_x}" = "yes" ; then
echo "***************************************************"
echo "configure: cannot find X11 headers and/or libraries,"
echo " which are needed for MrEd"
echo "To build just MzScheme, configure with --disable-mred"
echo "***************************************************"
echo configure aborted
exit 1
fi
fi
MAKE_MRED=mr
@ -1206,4 +1215,3 @@ if test "${enable_wbuild}" = "yes" ; then
fi
AC_OUTPUT($makefiles)