As usual, email me with any problems.
Ben
diff -ruN sane-0.71.orig/frontend/gtkglue.c sane-0.71/frontend/gtkglue.c
--- sane-0.71.orig/frontend/gtkglue.c Mon Jan 26 23:38:36 1998
+++ sane-0.71/frontend/gtkglue.c Fri Mar 13 19:47:13 1998
@@ -71,7 +71,7 @@
set_tooltip (GtkTooltips *tooltips, GtkWidget *widget, const char *desc)
{
if (desc && desc[0])
- gtk_tooltips_set_tips (tooltips, widget, (char *) desc);
+ gtk_tooltips_set_tip (tooltips, widget, (char *) desc, NULL);
}
int
@@ -808,7 +808,7 @@
GSGDialogElement *elem;
int i, j;
- gtk_tooltips_unref (dialog->tooltips);
+ gtk_object_unref (GTK_OBJECT (dialog->tooltips));
gtk_widget_destroy (dialog->main_hbox);
/* free the menu labels of integer/fix-point word-lists: */
diff -ruN sane-0.71.orig/frontend/xcam.c sane-0.71/frontend/xcam.c
--- sane-0.71.orig/frontend/xcam.c Mon Jan 19 23:39:51 1998
+++ sane-0.71/frontend/xcam.c Fri Mar 13 19:47:17 1998
@@ -896,7 +896,7 @@
sane_init (NULL, 0);
- gdk_set_debug_level (0);
+ /* gdk_set_debug_level (0); */
gdk_set_show_events (0);
gtk_init (&argc, &argv);
--- sane-0.71.orig/configure.in Mon Feb 23 21:46:04 1998
+++ sane-0.71/configure.in Sat Mar 21 00:28:40 1998
@@ -81,9 +81,6 @@
AM_PROG_LIBTOOL
dnl Checks for libraries.
-
-#### Choose a window system.
-
AC_PATH_X
if test "$no_x" = yes; then
window_system=none
@@ -105,10 +102,6 @@
AC_CHECK_FUNCS(dlopen, , enable_dynamic=no)],
[enable_dynamic=no])
fi
-
-# Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used
-# for the tests that follow. We set it back to REAL_CFLAGS later on.
-
HAVE_X11=yes
if test "${HAVE_X11}" = "yes"; then
DEFS="$C_SWITCH_X_SITE $DEFS"
@@ -130,18 +123,23 @@
AC_CHECK_LIB(Xext,main)
AC_CHECK_LIB(Xpm,main)
LIBX11="$LIBS"
- AC_CHECK_LIB(glib,main)
- AC_CHECK_LIB(gdk,main)
- AC_CHECK_LIB(gtk,gtk_gamma_curve_new,XSCAN="xscanimage xcam";
- LIBS="-lgtk ${LIBS}")
- LIBGTK="$LIBS"
+
+ AM_PATH_GTK(,XSCAN="xscanimage xcam",AC_MSG_WARN(GTK not found. Skipping xscanimage/xcam. Is gtk-config in your path?))
+
+ GIMP_SAVECPPFLAGS="$CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ CPPFLAGS="$CFLAGS $GTK_CFLAGS"
+
AC_CHECK_HEADERS(libgimp/gimp.h,LIBGIMP="-lgimp")
+
+
LIBS="$SAVED_LIBS"
+ CPPFLAGS="$GIMP_SAVECPPFLAGS"
fi
AC_SUBST(XSCAN)
AC_SUBST(LIBX11)
-AC_SUBST(LIBGTK)
AC_SUBST(LIBGIMP)
+
CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
-DPATH_SANE_DATA_DIR=\$(datadir) \
-DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
--- sane-0.71.orig/frontend/Makefile.in Tue Nov 4 23:36:47 1997
+++ sane-0.71/frontend/Makefile.in Sat Mar 21 00:33:31 1998
@@ -28,13 +28,13 @@
CC = @CC@
INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include \
- -I/usr/local/include
+ -I/usr/local/include @GTK_CFLAGS@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-LIBX11 = @LIBX11@
-LIBGTK = @LIBGTK@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
DEFS = @DEFS@
LIBTOOL = ../libtool
@@ -88,11 +88,11 @@
xscanimage: $(XSCAN_OBJS) $(LIBSANEI) $(LIBSANE) $(LIBLIB)
@$(LIBTOOL) $(MLINK) $(LINK) $(XSCAN_OBJS) $(LIBSANEI) $(LIBSANE) \
- $(LIBLIB) @LIBGIMP@ $(LIBGTK)
+ $(LIBLIB) @LIBGIMP@ $(GTK_LIBS) $(GTK_CFLAGS) $(LIBS)
xcam: $(XCAM_OBJS) $(LIBSANE) $(LIBSANEI) $(LIBLIB)
@$(LIBTOOL) $(MLINK) $(LINK) $(XCAM_OBJS) $(LIBSANEI) $(LIBSANE) \
- $(LIBLIB) $(LIBGTK)
+ $(LIBLIB) $(GTK_LIBS) $(GTK_CFLAGS) $(LIBS)
clean:
rm -f *.o *~ .*~ *.bak
-- Source code, list archive, and docs: http://www.mostang.com/sane/ To unsubscribe: echo unsubscribe sane-devel | mail majordomo@mostang.com