diff options
| author | Sven Neumann <sven@gimp.org> | 2001-09-20 16:31:21 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2001-09-20 16:31:21 +0000 |
| commit | b728e2eaba37c44ca93072b4153739de13495f67 (patch) | |
| tree | 2d1bf39f7ce67e66f1a2fec24db6d63e1136e27b /configure.in | |
| parent | 6adbb34d52a5040028e57449f5047e4e0013ceaf (diff) | |
| download | gtk+-b728e2eaba37c44ca93072b4153739de13495f67.tar.gz | |
configure.in gdk/Makefile.am gtk/Makefile.am gtk/gtkselection.c
2001-09-20 Sven Neumann <sven@gimp.org>
* configure.in
* gdk/Makefile.am
* gtk/Makefile.am
* gtk/gtkselection.c
* gtk/gtktreeview.c
* gtk/gtkwindow.c: removed remaining traces of nanox GDK backend.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/configure.in b/configure.in index 7c430f4888..ec143158cc 100644 --- a/configure.in +++ b/configure.in @@ -131,13 +131,13 @@ AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ]) gdktarget=x11 gdktargetlib=libgdk-x11-1.3.la gtktargetlib=libgtk-x11-1.3.la -AC_ARG_WITH(gdktarget, [ --with-gdktarget=[x11/nanox/linux-fb] select GDK target [default=x11] ], +AC_ARG_WITH(gdktarget, [ --with-gdktarget=[x11/linux-fb] select GDK target [default=x11] ], gdktarget=$with_gdktarget) AC_SUBST(gdktarget) case $gdktarget in - x11|nanox|linux-fb) ;; - *) AC_MSG_ERROR([Invalid target for GDK: use x11, nanox or linux-fb.]);; + x11|linux-fb) ;; + *) AC_MSG_ERROR([Invalid target for GDK: use x11 or linux-fb.]);; esac AC_ARG_ENABLE(shadowfb, [ --disable-shadowfb disable shadowfb support for linux-fb],,enable_shadowfb=yes) @@ -831,19 +831,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" = "xnanox"; then - AC_CHECK_LIB(nano-X, GrOpen,,AC_MSG_ERROR([nano-X libraries not found.])) - # nano-X may require additional libraries - GDK_EXTRA_LIBS="-lnano-X $GDK_EXTRA_LIBS" - - gdktargetlib="libgdk-nanox-1.3.la" - gtktargetlib="libgtk-nanox-1.3.la" - - AM_CONDITIONAL(USE_NANOX, true) -else - AM_CONDITIONAL(USE_NANOX, false) -fi - if test "x$gdktarget" = "xlinux-fb"; then gdktargetlib="libgdk-linux-fb-1.3.la" gtktargetlib="libgtk-linux-fb-1.3.la" @@ -983,7 +970,7 @@ AC_SUBST(GTK_XIM_FLAGS) # Checks for gtk-doc and docbook-tools ################################################## -AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) +AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) if test "x$with_html_dir" = "x" ; then HTML_DIR='${datadir}/gtk-doc/html' @@ -1014,7 +1001,7 @@ AC_CHECK_PROG(DB2HTML, db2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) dnl Let people disable the gtk-doc stuff. -AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto) +AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto) if test x$enable_gtk_doc = xauto ; then if test x$GTKDOC = xtrue ; then @@ -1094,9 +1081,6 @@ esac if test "x$gdktarget" = "xx11" ; then gdk_windowing=' #define GDK_WINDOWING_X11' -elif test "x$gdktarget" = "xnanox" ; then - gdk_windowing=' -#define GDK_WINDOWING_NANOX' elif test "x$gdktarget" = "xlinux-fb" ; then gdk_windowing=' #define GDK_WINDOWING_FB |