Make wineinstall work in the new-autoconf-version world.

This commit is contained in:
Adam D. Moss 2002-02-19 18:30:54 +00:00 committed by Alexandre Julliard
parent 6a32d2ce46
commit 49185ac25f
1 changed files with 12 additions and 8 deletions

View File

@ -45,6 +45,9 @@
# 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
# Use config.status instead of config.cache to check whether we're
# configured/compiled and to recreate the configuration
#--- 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
@ -144,7 +147,7 @@ function create_windows_directories {
# startup... # startup...
echo "WINE Installer v0.7" echo "WINE Installer v0.71"
echo echo
if [ "$BINDIST" = 'no' ] if [ "$BINDIST" = 'no' ]
@ -193,12 +196,12 @@ fi
# run the configure script, if necessary # run the configure script, if necessary
if [ -f config.cache ] && [ -f Makefile ] && [ Makefile -nt configure ] if [ -f config.status ] && [ -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.cache ./config.status > /dev/null
} }
else { else {
echo "Running configure..." echo "Running configure..."
@ -207,18 +210,18 @@ else {
then { then {
echo echo
echo "Configure failed, aborting install." echo "Configure failed, aborting install."
rm -f config.cache rm -f config.status
exit 1 exit 1
} }
fi fi
# load configure results # load configure results
. ./config.cache ./config.status
# 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.cache rm -f config.status
exit 1 exit 1
} }
fi fi
@ -227,7 +230,7 @@ fi
# now do the compilation # now do the compilation
if [ -f wine ] && [ wine -nt Makefile ] if [ -f wine ] && [ wine -nt config.status ]
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
@ -307,7 +310,8 @@ fi # BINDIST
# now check whether we should generate wine.conf # now check whether we should generate wine.conf
if [ -z "$DOGLOBALCONF" ] if [ -z "$DOGLOBALCONF" ]
then DOGLOBALCONF=auto then
DOGLOBALCONF=auto
fi fi
if [ "$DOGLOBALCONF" = 'auto' ] if [ "$DOGLOBALCONF" = 'auto' ]