Build Wintab support always on Windows. Don't require the Wintab SDK.

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 7ed909ff3acc67080c4364ac7a4bb22b4ba53a19..69f012199edd42a0ec9cac5ff9744bca9c2cea50 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -211,9 +211,6 @@ AC_ARG_ENABLE(visibility,
 AC_ARG_WITH(xinput,
             [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
 
-AC_ARG_WITH(wintab,
-            [AC_HELP_STRING([--with-wintab=DIRECTORY],
-                            [use Wintab API with win32 backend])])
 if test "$platform_win32" = yes; then
   gdktarget=win32
 else
@@ -568,33 +565,6 @@ AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
 AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
 AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
 
-if test "${with_wintab+set}" = set && test $with_wintab != no; then
-  AC_MSG_CHECKING([for wintab.h])
-  saved_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -I$with_wintab/include"
-  AC_TRY_COMPILE([#include <windows.h>
-#include <wintab.h>], 
-   [],
-   [AC_MSG_RESULT(yes)
-    AC_MSG_CHECKING([for wntab32x.lib])
-    if test -f $with_wintab/lib/i386/wntab32x.lib ; then
-      AC_MSG_RESULT(yes)
-      have_wintab=yes
-      AC_DEFINE(HAVE_WINTAB)
-      WINTAB_LIB="$with_wintab/lib/i386/wntab32x.lib"
-      AC_SUBST(WINTAB_LIB)
-    else
-      AC_MSG_RESULT(no)
-      CFLAGS="$saved_cflags"
-      have_wintab=no
-    fi
-    ],
-   [AC_MSG_RESULT(no)
-    CFLAGS="$saved_cflags"
-    have_wintab=no])
-fi
-AM_CONDITIONAL(HAVE_WINTAB, test x$have_wintab = xyes)
-
 saved_cflags="$CFLAGS"
 saved_ldflags="$LDFLAGS"
 
@@ -1321,6 +1291,7 @@ if test "x$gdktarget" = "xx11"; then
     AC_DEFINE(HAVE_XFIXES, 1, Have the XFIXES X extension)
     
     X_PACKAGES="$X_PACKAGES xfixes"
+    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
   fi
 
   if $have_base_x_pc ; then
@@ -1340,13 +1311,6 @@ else
 fi
 
 if test "x$gdktarget" = "xwin32"; then
-  # We start off with the libraries from Pango
-
-  if test x$have_wintab = xyes; then
-    GDK_WIN32_EXTRA_CFLAGS="-I $with_wintab/include"
-    AC_SUBST(GDK_WIN32_EXTRA_CFLAGS)
-  fi
-
   GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -Wl,-luuid"
   AM_CONDITIONAL(USE_WIN32, true)
 else