configure: Add some quoting required by autoconf 2.68.
This commit is contained in:
parent
e248615ae7
commit
9797da40ec
|
@ -62,7 +62,7 @@ dnl
|
||||||
dnl Usage: WINE_TRY_ASM_LINK(asm-code,includes,function,[action-if-found,[action-if-not-found]])
|
dnl Usage: WINE_TRY_ASM_LINK(asm-code,includes,function,[action-if-found,[action-if-not-found]])
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN([WINE_TRY_ASM_LINK],
|
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 **** Check if we can link an empty program with special CFLAGS ****
|
||||||
dnl
|
dnl
|
||||||
|
@ -75,7 +75,7 @@ AC_DEFUN([WINE_TRY_CFLAGS],
|
||||||
AC_CACHE_CHECK([whether the compiler supports $1], ac_var,
|
AC_CACHE_CHECK([whether the compiler supports $1], ac_var,
|
||||||
[ac_wine_try_cflags_saved=$CFLAGS
|
[ac_wine_try_cflags_saved=$CFLAGS
|
||||||
CFLAGS="$CFLAGS $1"
|
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)])
|
[AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
|
||||||
CFLAGS=$ac_wine_try_cflags_saved])
|
CFLAGS=$ac_wine_try_cflags_saved])
|
||||||
AS_IF([test AS_VAR_GET(ac_var) = yes],
|
AS_IF([test AS_VAR_GET(ac_var) = yes],
|
||||||
|
@ -89,7 +89,7 @@ dnl
|
||||||
AC_DEFUN([WINE_TRY_SHLIB_FLAGS],
|
AC_DEFUN([WINE_TRY_SHLIB_FLAGS],
|
||||||
[ac_wine_try_cflags_saved=$CFLAGS
|
[ac_wine_try_cflags_saved=$CFLAGS
|
||||||
CFLAGS="$CFLAGS $1"
|
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])
|
CFLAGS=$ac_wine_try_cflags_saved])
|
||||||
|
|
||||||
dnl **** Check whether we need to define a symbol on the compiler command line ****
|
dnl **** Check whether we need to define a symbol on the compiler command line ****
|
||||||
|
|
|
@ -159,7 +159,7 @@ case $host in
|
||||||
CC="$CC -m32"
|
CC="$CC -m32"
|
||||||
CXX="$CXX -m32"
|
CXX="$CXX -m32"
|
||||||
AC_MSG_CHECKING([whether $CC works])
|
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_RESULT([no])
|
||||||
AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.])])
|
AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.])])
|
||||||
LD="${LD:-ld} -m elf_i386"
|
LD="${LD:-ld} -m elf_i386"
|
||||||
|
@ -774,14 +774,14 @@ case $host_os in
|
||||||
if test "x$enable_win16" = "xyes"
|
if test "x$enable_win16" = "xyes"
|
||||||
then
|
then
|
||||||
AC_MSG_CHECKING([whether 16-bit code can be built correctly])
|
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"
|
"bad:\tnop;nop\n"
|
||||||
"good:\tnop;nop\n\t"
|
"good:\tnop;nop\n\t"
|
||||||
".globl _testfunc\n"
|
".globl _testfunc\n"
|
||||||
"_testfunc:\tcallw good");
|
"_testfunc:\tcallw good");
|
||||||
extern void testfunc();]],
|
extern void testfunc();]],
|
||||||
[[unsigned short *p = (unsigned short *)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(yes),
|
||||||
[AC_MSG_RESULT(no)
|
[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.])],
|
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"
|
ac_save_CC="$CC"
|
||||||
CC="$CROSSCC"
|
CC="$CROSSCC"
|
||||||
AC_MSG_CHECKING([whether $CROSSCC works])
|
AC_MSG_CHECKING([whether $CROSSCC works])
|
||||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
|
||||||
[AC_MSG_RESULT([yes])
|
[AC_MSG_RESULT([yes])
|
||||||
set x $CROSSCC
|
set x $CROSSCC
|
||||||
shift
|
shift
|
||||||
|
|
Loading…
Reference in New Issue