mirror of
https://gitlab.winehq.org/wine/wine.git
synced 2024-11-19 17:06:04 -07:00
configure: Added an ERROR_WITH macro for packages that we can't do without.
This commit is contained in:
parent
1f051b8a7d
commit
76adea11a0
3 changed files with 9 additions and 6 deletions
6
aclocal.m4
vendored
6
aclocal.m4
vendored
|
@ -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
|
||||
|
|
7
configure
vendored
7
configure
vendored
|
@ -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.])
|
||||
|
||||
|
|
Loading…
Reference in a new issue