dosemu-nox.patch

   1 --- configure.ac.orig   Sat Feb 15 13:07:06 2003
   2 +++ configure.ac        Sat Feb 15 13:10:07 2003
   3 @@ -241,18 +241,19 @@
   4  )
   5
   6  AC_PATH_XTRA
   7 -LDFLAGS="$LDFLAGS $X_LIBS"
   8 -CPPFLAGS="$X_CFLAGS"
   9
  10 -AC_CHECK_LIB(X11, XOpenDisplay, ,
  11 +if test "$no_x" = "yes" ; then
  12 +    AS_MESSAGE(checking Compiling without X support...)
  13 +else
  14 +       LDFLAGS="$LDFLAGS $X_LIBS"
  15 +       CPPFLAGS="$X_CFLAGS"
  16 +
  17 +       AC_CHECK_LIB(X11, XOpenDisplay, ,
  18     # sometimes statically linked binaries need libdl too ...
  19     AC_CHECK_LIB(X11, XCloseDisplay, LIBS="$LIBS -lX11 -ldl",
  20       AC_CHECK_LIB(Xwindow, main, , no_x="yes" ),
  21    -ldl))
  22
  23 -if test "$no_x" = "yes" ; then
  24 -    AS_MESSAGE(checking Compiling without X support...)
  25 -else
  26      AS_MESSAGE(checking Compiling with X support...)
  27      AC_DEFINE(X_SUPPORT)
  28      X_SUPPORT="X_SUPPORT=1"
  29 @@ -260,34 +261,35 @@
  30      AC_DEFINE(X_GRAPHICS)
  31      X_GRAPHICS="X_GRAPHICS=1"
  32      AC_SUBST(X_GRAPHICS)
  33 -fi
  34 -
  35
  36  dnl Check for the MITSHM extention to speed up VGAemu
  37
  38 -AC_ARG_ENABLE(mitshm,
  39 +       AC_ARG_ENABLE(mitshm,
  40                [  --enable-mitshm         force use of MITSHM X extension],
  41                [forced_mitshm="yes"],[forced_mitshm="no"])
  42
  43 -AC_ARG_ENABLE(nomitshm,
  44 +       AC_ARG_ENABLE(nomitshm,
  45                [  --enable-nomitshm       do NOT use the MITSHM X extension],
  46                [forced_nomitshm="yes"],[forced_nomitshm="no"])
  47
  48 -if test "$forced_mitshm" = "yes" -a "$forced_nomitshm" = "yes" ; then
  49 -  AC_MSG_ERROR(Can't use --enable-mitshm and --enable-nomitshm at the same time)
  50 -fi
  51 +       if test "$forced_mitshm" = "yes" -a "$forced_nomitshm" = "yes" ; then
  52 +       AC_MSG_ERROR(Can't use --enable-mitshm and --enable-nomitshm at the same time)
  53 +       fi
  54
  55 -if test "$forced_nomitshm" != "yes" -a "$no_x" != "yes" ; then
  56 -  AC_CHECK_HEADER(X11/extensions/XShm.h,
  57 +       if test "$forced_nomitshm" != "yes" -a "$no_x" != "yes" ; then
  58 +       AC_CHECK_HEADER(X11/extensions/XShm.h,
  59           [AC_DEFINE(HAVE_MITSHM,1) LIBS="-lXext $LIBS"],
  60           AS_MESSAGE(checking Compiling without the MITSHM X extension),
  61           [#include <X11/Xlib.h>])
  62 -fi
  63 +       fi
  64
  65 -AC_CHECK_HEADER(X11/extensions/xf86vmode.h,
  66 +       AC_CHECK_HEADER(X11/extensions/xf86vmode.h,
  67           [AC_DEFINE(HAVE_XVIDMODE,1) LIBS="-lXxf86vm $LIBS"],
  68           AS_MESSAGE(checking Compiling without the XF86 video mode extension),
  69           [#include <X11/Xlib.h>])
  70 +fi
  71 +
  72 +
  73
  74  PACKAGE_VERSION=`cat VERSION`
  75  VV=$PACKAGE_VERSION