adjust configure script to disable --prefix on Mac OS X unless either --enable-xonx or --enable-macprefix is also provided

svn: r14904
This commit is contained in:
Matthew Flatt 2009-05-21 19:25:51 +00:00
parent ef15fd2ded
commit 99c159a727
2 changed files with 29 additions and 0 deletions

17
src/configure vendored
View File

@ -1368,6 +1368,7 @@ Optional Features:
--enable-xonx compile X11 (not Quartz) MrEd for Mac OS X
--enable-libfw install Mac OS X frameworks to /Library/Frameworks
--enable-userfw install Mac OS X frameworks to ~/Library/Frameworks
--enable-macprefix allow --prefix with a Mac OS X install
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -2011,6 +2012,11 @@ if test "${enable_libfw+set}" = set; then
enableval=$enable_libfw;
fi
# Check whether --enable-macprefix was given.
if test "${enable_macprefix+set}" = set; then
enableval=$enable_macprefix;
fi
###### Get OS Type #######
@ -2071,6 +2077,17 @@ else
if test "$OS" = "Darwin" ; then
enable_quartz=yes
enable_origtree=yes
if test "${prefix}" != "NONE" ; then
if test "${enable_macprefix}" != "yes" ; then
echo "ERROR: --prefix not allowed for a Mac OS X build, unless either"
echo " --enable-xonx is supplied (to create a Unix-style"
echo " build), or "
echo " --enable-macprefix is supplied (to allow a Mac-style"
echo " installation, even though --prefix is normally used"
echo " for Unix-style installations)"
exit 1
fi
fi
fi
fi

View File

@ -73,6 +73,7 @@ AC_ARG_ENABLE(noopt, [ --enable-sdk=<path> use Mac OS X 10.4 SDK director
AC_ARG_ENABLE(xonx, [ --enable-xonx compile X11 (not Quartz) MrEd for Mac OS X])
AC_ARG_ENABLE(libfw, [ --enable-libfw install Mac OS X frameworks to /Library/Frameworks])
AC_ARG_ENABLE(libfw, [ --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks])
AC_ARG_ENABLE(macprefix, [ --enable-macprefix allow --prefix with a Mac OS X install])
###### Get OS Type #######
@ -133,6 +134,17 @@ else
if test "$OS" = "Darwin" ; then
enable_quartz=yes
enable_origtree=yes
if test "${prefix}" != "NONE" ; then
if test "${enable_macprefix}" != "yes" ; then
echo "ERROR: --prefix not allowed for a Mac OS X build, unless either"
echo " --enable-xonx is supplied (to create a Unix-style"
echo " build), or "
echo " --enable-macprefix is supplied (to allow a Mac-style"
echo " installation, even though --prefix is normally used"
echo " for Unix-style installations)"
exit 1
fi
fi
fi
fi