Remove linux-fb leftovers

svn path=/trunk/; revision=18113

1 files changed, 3 insertions, 42 deletions

diff --git a/configure.in b/configure.in
index cd50a090a9..880d01662f 100644
--- a/configure.in
+++ b/configure.in
@@ -221,13 +221,13 @@ else
   gdktarget=x11
 fi
 
-AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/linux-fb/win32/quartz/directfb]] select non-default GDK target],
+AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
 	gdktarget=$with_gdktarget)
 
 AC_SUBST(gdktarget)
 case $gdktarget in
-  x11|linux-fb|win32|quartz|directfb) ;;
-  *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb, quartz, directfb or win32.]);;
+  x11|win32|quartz|directfb) ;;
+  *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
 esac
 
 gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
@@ -236,16 +236,6 @@ gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
 AC_SUBST(gdktargetlib)
 AC_SUBST(gtktargetlib)
 
-AC_ARG_ENABLE(shadowfb,
-              [AC_HELP_STRING([--disable-shadowfb],
-                              [disable shadowfb support for linux-fb])],,
-              [enable_shadowfb=yes])
-
-AC_ARG_ENABLE(fbmanager,
-              [AC_HELP_STRING([--enable-fbmanager],
-                              [enable framebuffer manager support (GtkFB)])],,
-              enable_fbmanager=no)
-	
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
   GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" 
@@ -1395,24 +1385,6 @@ AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_CFLAGS)
 AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
 AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
-if test "x$gdktarget" = "xlinux-fb"; then
-  if test x$enable_shadowfb = xyes ; then
-    AC_DEFINE(ENABLE_SHADOW_FB)
-  fi
-
-  if test x$enable_fbmanager = xyes ; then
-    AC_DEFINE(ENABLE_FB_MANAGER)
-    AM_CONDITIONAL(ENABLE_FB_MANAGER, true)
-  else
-    AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
-  fi
-  
-  AM_CONDITIONAL(USE_LINUX_FB, true)
-else
-  AM_CONDITIONAL(USE_LINUX_FB, false)
-  AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
-fi
-
 if test "x$gdktarget" = "xdirectfb"; then
   DIRECTFB_REQUIRED_VERSION=0.9.24
   AC_MSG_CHECKING(for DirectFB)
@@ -1706,10 +1678,6 @@ if test "x$gdktarget" = "xx11" ; then
 elif test "x$gdktarget" = "xwin32" ; then
   gdk_windowing='
 #define GDK_WINDOWING_WIN32'
-elif test "x$gdktarget" = "xlinux-fb" ; then
-  gdk_windowing='
-#define GDK_WINDOWING_FB
-#define GDK_NATIVE_WINDOW_POINTER'
 elif test "x$gdktarget" = "xquartz" ; then
   gdk_windowing='
 #define GDK_WINDOWING_QUARTZ'
@@ -1772,7 +1740,6 @@ gdk/x11/Makefile
 gdk/win32/Makefile
 gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
-gdk/linux-fb/Makefile
 gdk/quartz/Makefile
 gdk/directfb/Makefile
 gtk/Makefile
@@ -1803,9 +1770,3 @@ AC_OUTPUT
 
 echo "configuration:
         target: $gdktarget"
-
-if test "x$gdktarget" = "xlinux-fb"; then
-  echo "Warning: The linux-fb GDK target is unmaintained"
-  echo "         and may not work or even compile"
-fi
-