configure: Move down the X11 checks to allow defaulting to --without-x for the Windows build.
This commit is contained in:
parent
8ab829a68a
commit
40664c0c54
|
@ -172,8 +172,6 @@ then
|
||||||
AC_SUBST(TARGETFLAGS,"-b $host_alias")
|
AC_SUBST(TARGETFLAGS,"-b $host_alias")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_PATH_XTRA
|
|
||||||
|
|
||||||
dnl Check for flex
|
dnl Check for flex
|
||||||
AC_CHECK_PROGS(FLEX,flex,none)
|
AC_CHECK_PROGS(FLEX,flex,none)
|
||||||
if test "$FLEX" = "none"
|
if test "$FLEX" = "none"
|
||||||
|
@ -538,6 +536,8 @@ case $host_os in
|
||||||
enable_ws2_32=${enable_ws2_32:-no}
|
enable_ws2_32=${enable_ws2_32:-no}
|
||||||
enable_loader=${enable_loader:-no}
|
enable_loader=${enable_loader:-no}
|
||||||
enable_server=${enable_server:-no}
|
enable_server=${enable_server:-no}
|
||||||
|
dnl Disable dependencies that are not useful on Windows
|
||||||
|
with_x=${with_x:-no}
|
||||||
;;
|
;;
|
||||||
darwin*|macosx*)
|
darwin*|macosx*)
|
||||||
DLLEXT=".so"
|
DLLEXT=".so"
|
||||||
|
@ -670,6 +670,8 @@ fi
|
||||||
|
|
||||||
dnl **** Check for X11 ****
|
dnl **** Check for X11 ****
|
||||||
|
|
||||||
|
AC_PATH_XTRA
|
||||||
|
|
||||||
if test "$have_x" = "yes"
|
if test "$have_x" = "yes"
|
||||||
then
|
then
|
||||||
XLIB="-lXext -lX11"
|
XLIB="-lXext -lX11"
|
||||||
|
|
Loading…
Reference in New Issue