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
Lorenzo Ferrillo
wine
Commits
9797da40
Commit
9797da40
authored
13 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Add some quoting required by autoconf 2.68.
parent
e248615a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
aclocal.m4
+3
-3
3 additions, 3 deletions
aclocal.m4
configure
+437
-414
437 additions, 414 deletions
configure
configure.ac
+4
-4
4 additions, 4 deletions
configure.ac
with
444 additions
and
421 deletions
aclocal.m4
+
3
−
3
View file @
9797da40
...
...
@@ -62,7 +62,7 @@ dnl
dnl Usage: WINE_TRY_ASM_LINK(asm-code,includes,function,[action-if-found,[action-if-not-found]])
dnl
AC_DEFUN([WINE_TRY_ASM_LINK],
[AC_LINK_IFELSE(AC_LANG_PROGRAM([[$2]],[[asm($1); $3]]),[$4],[$5])])
[AC_LINK_IFELSE(
[
AC_LANG_PROGRAM([[$2]],[[asm($1); $3]])
]
,[$4],[$5])])
dnl **** Check if we can link an empty program with special CFLAGS ****
dnl
...
...
@@ -75,7 +75,7 @@ AC_DEFUN([WINE_TRY_CFLAGS],
AC_CACHE_CHECK([whether the compiler supports $1], ac_var,
[ac_wine_try_cflags_saved=$CFLAGS
CFLAGS="$CFLAGS $1"
AC_LINK_IFELSE(AC_LANG_SOURCE([[int main(int argc, char **argv) { return 0; }]]),
AC_LINK_IFELSE(
[
AC_LANG_SOURCE([[int main(int argc, char **argv) { return 0; }]])
]
,
[AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
CFLAGS=$ac_wine_try_cflags_saved])
AS_IF([test AS_VAR_GET(ac_var) = yes],
...
...
@@ -89,7 +89,7 @@ dnl
AC_DEFUN([WINE_TRY_SHLIB_FLAGS],
[ac_wine_try_cflags_saved=$CFLAGS
CFLAGS="$CFLAGS $1"
AC_LINK_IFELSE([void myfunc() {}],[$2],[$3])
AC_LINK_IFELSE([
AC_LANG_SOURCE([
void myfunc() {}]
)]
,[$2],[$3])
CFLAGS=$ac_wine_try_cflags_saved])
dnl **** Check whether we need to define a symbol on the compiler command line ****
...
...
This diff is collapsed.
Click to expand it.
configure
+
437
−
414
View file @
9797da40
This diff is collapsed.
Click to expand it.
configure.ac
+
4
−
4
View file @
9797da40
...
...
@@ -159,7 +159,7 @@ case $host in
CC="$CC -m32"
CXX="$CXX -m32"
AC_MSG_CHECKING([whether $CC works])
AC_LINK_IFELSE(AC_LANG_PROGRAM(),AC_MSG_RESULT([yes]),
AC_LINK_IFELSE(
[
AC_LANG_PROGRAM()
]
,AC_MSG_RESULT([yes]),
[AC_MSG_RESULT([no])
AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.])])
LD="${LD:-ld} -m elf_i386"
...
...
@@ -774,14 +774,14 @@ case $host_os in
if test "x$enable_win16" = "xyes"
then
AC_MSG_CHECKING([whether 16-bit code can be built correctly])
AC_RUN_IFELSE(AC_LANG_PROGRAM([[asm(".text\n"
AC_RUN_IFELSE(
[
AC_LANG_PROGRAM([[asm(".text\n"
"bad:\tnop;nop\n"
"good:\tnop;nop\n\t"
".globl _testfunc\n"
"_testfunc:\tcallw good");
extern void testfunc();]],
[[unsigned short *p = (unsigned short *)testfunc;
return p[
[0]
] != 0xe866 || p[
[
1]
]
!= 0xfffa]]),
return p[
0
] != 0xe866 || p[1] != 0xfffa]])
]
,
AC_MSG_RESULT(yes),
[AC_MSG_RESULT(no)
AC_MSG_ERROR([Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support.])],
...
...
@@ -888,7 +888,7 @@ then
ac_save_CC="$CC"
CC="$CROSSCC"
AC_MSG_CHECKING([whether $CROSSCC works])
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),
AC_COMPILE_IFELSE(
[
AC_LANG_PROGRAM([])
]
,
[AC_MSG_RESULT([yes])
set x $CROSSCC
shift
...
...
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