From 85ebbd90faeaff95ef78ca52dcd9978662801723 Mon Sep 17 00:00:00 2001 From: rob Date: Mon, 20 Apr 2009 10:01:59 +0000 Subject: [PATCH] make build succeed when x11 hidd is explicity disabled git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@31140 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- configure | 6 +++--- configure.in | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 3af4132e9..99235b8f0 100755 --- a/configure +++ b/configure @@ -11897,6 +11897,8 @@ fi *) x11_hidd="auto" ;; esac + ENABLE_X11=0 + if test "x-$x11_hidd" != "x-no" ; then { $as_echo "$as_me:$LINENO: checking for X" >&5 @@ -12162,7 +12164,6 @@ fi $as_echo "$as_me: error: X11 libs/headers not found, cannot build X11 hidd as requested" >&2;} { (exit 1); exit 1; }; } fi - ENABLE_X11=0 else x11_hidd_target=kernel-x11gfx-kobj @@ -13912,8 +13913,7 @@ $debug || if test -n "$CONFIG_FILES"; then -ac_cr=' -' +ac_cr=' ' ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' diff --git a/configure.in b/configure.in index da6227efd..1839e6109 100644 --- a/configure.in +++ b/configure.in @@ -1450,6 +1450,8 @@ if test "x-$aros_flavour" = "x-emulation" -o "x-$aros_flavour" = "x-emulcompat" *) x11_hidd="auto" ;; esac + ENABLE_X11=0 + dnl they want it if test "x-$x11_hidd" != "x-no" ; then @@ -1474,7 +1476,6 @@ if test "x-$aros_flavour" = "x-emulation" -o "x-$aros_flavour" = "x-emulcompat" dnl and they explicitly asked for it, bail out AC_MSG_ERROR([X11 libs/headers not found, cannot build X11 hidd as requested]) fi - ENABLE_X11=0 else dnl found it, setup the metatarget -- 2.11.4.GIT