Partially revert previous changes, force configure to write an
old-style config.cache.
This commit is contained in:
parent
7423dc0463
commit
e3d9406fcd
|
@ -45,9 +45,12 @@
|
||||||
# misc cleanups and reordering of questions
|
# misc cleanups and reordering of questions
|
||||||
# added check to see if wine is installed when we are running as a normal
|
# added check to see if wine is installed when we are running as a normal
|
||||||
# user and print a message if wine cannot be found
|
# user and print a message if wine cannot be found
|
||||||
# Feb 16 2002 - Adam d. Moss
|
# Feb 16 2002 - Adam D. Moss
|
||||||
# Use config.status instead of config.cache to check whether we're
|
# Use config.status instead of config.cache to check whether we're
|
||||||
# configured/compiled and to recreate the configuration
|
# configured/compiled and to recreate the configuration
|
||||||
|
# Feb 20 2002 - Adam D. Moss
|
||||||
|
# Partially revert previous changes, force configure to write an
|
||||||
|
# old-style config.cache
|
||||||
|
|
||||||
#--- defaults (change these if you are a packager)
|
#--- defaults (change these if you are a packager)
|
||||||
CONFARGS="--enable-opengl" # configure args, e.g. --prefix=/usr --sysconfdir=/etc
|
CONFARGS="--enable-opengl" # configure args, e.g. --prefix=/usr --sysconfdir=/etc
|
||||||
|
@ -196,32 +199,32 @@ fi
|
||||||
|
|
||||||
# run the configure script, if necessary
|
# run the configure script, if necessary
|
||||||
|
|
||||||
if [ -f config.status ] && [ -f Makefile ] && [ Makefile -nt configure ]
|
if [ -f config.cache ] && [ -f Makefile ] && [ Makefile -nt configure ]
|
||||||
then {
|
then {
|
||||||
echo "I see that WINE has already been configured, so I'll skip that."
|
echo "I see that WINE has already been configured, so I'll skip that."
|
||||||
std_sleep
|
std_sleep
|
||||||
# load configure results
|
# load configure results
|
||||||
./config.status > /dev/null
|
. ./config.cache
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
echo "Running configure..."
|
echo "Running configure..."
|
||||||
echo
|
echo
|
||||||
if ! ./configure $CONFARGS
|
if ! ./configure -C $CONFARGS
|
||||||
then {
|
then {
|
||||||
echo
|
echo
|
||||||
echo "Configure failed, aborting install."
|
echo "Configure failed, aborting install."
|
||||||
rm -f config.status
|
rm -f config.cache
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
# load configure results
|
# load configure results
|
||||||
./config.status
|
. ./config.cache
|
||||||
# make sure X was found
|
# make sure X was found
|
||||||
eval "$ac_cv_have_x"
|
eval "$ac_cv_have_x"
|
||||||
if [ "$have_x" != "yes" ]
|
if [ "$have_x" != "yes" ]
|
||||||
then {
|
then {
|
||||||
echo "Install the X development headers and try again."
|
echo "Install the X development headers and try again."
|
||||||
rm -f config.status
|
rm -f config.cache
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
@ -230,7 +233,7 @@ fi
|
||||||
|
|
||||||
# now do the compilation
|
# now do the compilation
|
||||||
|
|
||||||
if [ -f wine ] && [ wine -nt config.status ]
|
if [ -f wine ] && [ wine -nt config.cache ]
|
||||||
then {
|
then {
|
||||||
echo "Hmm, looks like WINE is already compiled. I'll skip that too, I guess."
|
echo "Hmm, looks like WINE is already compiled. I'll skip that too, I guess."
|
||||||
std_sleep
|
std_sleep
|
||||||
|
|
Loading…
Reference in New Issue