Commit 76adea11 authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Added an ERROR_WITH macro for packages that we can't do without.

parent 1f051b8a
......@@ -178,6 +178,12 @@ AC_DEFUN([WINE_WARNING_WITH],[AS_IF([$2],[case "x$with_$1" in
This is an error since --with-$1 was requested.]) ;;
esac])])
AC_DEFUN([WINE_ERROR_WITH],[AS_IF([$2],[case "x$with_$1" in
xno) ;;
*) AC_MSG_ERROR([$3
Use the --without-$1 option if you really want this.]) ;;
esac])])
AC_DEFUN([WINE_PRINT_MESSAGES],[ac_save_IFS="$IFS"
IFS="|"
if test "x$wine_notices != "x; then
......
......@@ -11563,18 +11563,15 @@ else
fi
if test "x$XLIB" = "x"; then
case "x$with_x" in
x) wine_warnings="$wine_warnings|X development files not found. Wine will be built
without X support, which probably isn't what you want. You will need to install
development packages of Xlib/Xfree86 at the very least." ;;
xno) ;;
*) { { echo "$as_me:$LINENO: error: X development files not found. Wine will be built
without X support, which probably isn't what you want. You will need to install
development packages of Xlib/Xfree86 at the very least.
This is an error since --with-x was requested." >&5
Use the --without-x option if you really want this." >&5
echo "$as_me: error: X development files not found. Wine will be built
without X support, which probably isn't what you want. You will need to install
development packages of Xlib/Xfree86 at the very least.
This is an error since --with-x was requested." >&2;}
Use the --without-x option if you really want this." >&2;}
{ (exit 1); exit 1; }; } ;;
esac
fi
......
......@@ -781,7 +781,7 @@ else
X_CFLAGS=""
X_LIBS=""
fi
WINE_WARNING_WITH(x,[test "x$XLIB" = "x"],[X development files not found. Wine will be built
WINE_ERROR_WITH(x,[test "x$XLIB" = "x"],[X development files not found. Wine will be built
without X support, which probably isn't what you want. You will need to install
development packages of Xlib/Xfree86 at the very least.])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment