mirror of https://github.com/encounter/SDL.git
tests: regenerate configure using autoconf patched for AC_PATH_X11
Specifically this patch which does not invoke _AC_PATH_X_XMKMF and _AC_PATH_X_DIRECT internal autoconf routines when cross-compiling: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=33c3a47c04ab70a4dd54963fe433a171bc03747f Without this, CFLAGS would brokenly have system include paths like -I/usr/include/X11 when cross-compiling e.g. for windows. (And it also resulted in annoying imake crashes for my setup...)
This commit is contained in:
parent
6bd4c717a1
commit
5c654d0df4
|
@ -20178,6 +20178,8 @@ ac_x_header_dirs='
|
||||||
/usr/local/include/X11R5
|
/usr/local/include/X11R5
|
||||||
/usr/local/include/X11R4
|
/usr/local/include/X11R4
|
||||||
|
|
||||||
|
/opt/X11/include
|
||||||
|
|
||||||
/usr/X386/include
|
/usr/X386/include
|
||||||
/usr/x386/include
|
/usr/x386/include
|
||||||
/usr/XFree86/include/X11
|
/usr/XFree86/include/X11
|
||||||
|
|
|
@ -3625,7 +3625,33 @@ else
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
# One or both of the vars are not set, and there is no cached value.
|
# One or both of the vars are not set, and there is no cached value.
|
||||||
ac_x_includes=no ac_x_libraries=no
|
ac_x_includes=no
|
||||||
|
ac_x_libraries=no
|
||||||
|
# Do we need to do anything special at all?
|
||||||
|
ac_save_LIBS=$LIBS
|
||||||
|
LIBS="-lX11 $LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
XrmInitialize ()
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"; then :
|
||||||
|
# We can compile and link X programs with no special options.
|
||||||
|
ac_x_includes=
|
||||||
|
ac_x_libraries=
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
LIBS="$ac_save_LIBS"
|
||||||
|
# If that didn't work, only try xmkmf and filesystem searches
|
||||||
|
# for native compilation.
|
||||||
|
if test x"$ac_x_includes" = xno && test "$cross_compiling" = no; then :
|
||||||
rm -f -r conftest.dir
|
rm -f -r conftest.dir
|
||||||
if mkdir conftest.dir; then
|
if mkdir conftest.dir; then
|
||||||
cd conftest.dir
|
cd conftest.dir
|
||||||
|
@ -3692,6 +3718,8 @@ ac_x_header_dirs='
|
||||||
/usr/local/include/X11R5
|
/usr/local/include/X11R5
|
||||||
/usr/local/include/X11R4
|
/usr/local/include/X11R4
|
||||||
|
|
||||||
|
/opt/X11/include
|
||||||
|
|
||||||
/usr/X386/include
|
/usr/X386/include
|
||||||
/usr/x386/include
|
/usr/x386/include
|
||||||
/usr/XFree86/include/X11
|
/usr/XFree86/include/X11
|
||||||
|
@ -3765,15 +3793,17 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
fi # $ac_x_libraries = no
|
fi # $ac_x_libraries = no
|
||||||
|
|
||||||
|
fi
|
||||||
|
# Record the results.
|
||||||
case $ac_x_includes,$ac_x_libraries in #(
|
case $ac_x_includes,$ac_x_libraries in #(
|
||||||
no,* | *,no | *\'*)
|
no,* | *,no | *\'*) :
|
||||||
# Didn't find X, or a directory has "'" in its name.
|
# Didn't find X, or a directory has "'" in its name.
|
||||||
ac_cv_have_x="have_x=no" ;; #(
|
ac_cv_have_x="have_x=no" ;; #(
|
||||||
*)
|
*) :
|
||||||
# Record where we found X for the cache.
|
# Record where we found X for the cache.
|
||||||
ac_cv_have_x="have_x=yes\
|
ac_cv_have_x="have_x=yes\
|
||||||
ac_x_includes='$ac_x_includes'\
|
ac_x_includes='$ac_x_includes'\
|
||||||
ac_x_libraries='$ac_x_libraries'"
|
ac_x_libraries='$ac_x_libraries'" ;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
;; #(
|
;; #(
|
||||||
|
|
Loading…
Reference in New Issue