Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yoann Laissus
wine
Commits
e3d9406f
Commit
e3d9406f
authored
23 years ago
by
Adam D. Moss
Committed by
Alexandre Julliard
23 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Partially revert previous changes, force configure to write an
old-style config.cache.
parent
7423dc04
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/wineinstall
+12
-9
12 additions, 9 deletions
tools/wineinstall
with
12 additions
and
9 deletions
tools/wineinstall
+
12
−
9
View file @
e3d9406f
...
@@ -45,9 +45,12 @@
...
@@ -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
...
@@ -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
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment