From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Mon, 8 Apr 2013 03:01:27 +0000 (-0700)
Subject: gtk: Replace leftover references to gtk+-2.0 with gtk+-3.0.
X-Git-Tag: mit-scheme-pucked-9.2.12~516
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=2afb71525c27a21dfad990f2adc129a53d332d7d;p=mit-scheme.git

gtk: Replace leftover references to gtk+-2.0 with gtk+-3.0.
---

diff --git a/doc/ffi/ffi.texinfo b/doc/ffi/ffi.texinfo
index da6c87ece..d98a47528 100644
--- a/doc/ffi/ffi.texinfo
+++ b/doc/ffi/ffi.texinfo
@@ -152,11 +152,11 @@ data types is given in a case sensitive @file{.cdecl} file.  The C
 declarations look like this:
 
 @smallexample
-(extern (* GtkWidget)              @r{; gtk+-2.4.0/gtk/gtkwindow.h}
+(extern (* GtkWidget)
         gtk_window_new
         (type GtkWindowType))
 
-(typedef GtkWindowType             @r{; gtk+-2.4.0/gtk/gtkenums.h}
+(typedef GtkWindowType
          (enum
           (GTK_WINDOW_TOPLEVEL)
           (GTK_WINDOW_POPUP)))
@@ -657,10 +657,10 @@ install-example: build-example
 build-example: prhello-shim.so prhello-types.bin prhello-const.bin
 
 prhello-shim.so: prhello-shim.o
-	$(CC) -shared -fPIC -o $@ $^ `pkg-config --libs gtk+-2.0`
+	$(CC) -shared -fPIC -o $@ $^ `pkg-config --libs gtk+-3.0`
 
 prhello-shim.o: prhello-shim.c
-	$(CC) -I../lib -Wall -fPIC `pkg-config --cflags gtk+-2.0` -o $@ -c $<
+	$(CC) -I../lib -Wall -fPIC `pkg-config --cflags gtk+-3.0` -o $@ -c $<
 
 prhello-shim.c prhello-const.c prhello-types.bin: prhello.cdecl
 	(echo "(load-option 'FFI)"; \
@@ -675,10 +675,10 @@ prhello-const.scm: prhello-const
 
 prhello-const: prhello-const.o
 	@rm -f $@
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --libs gtk+-2.0`
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --libs gtk+-3.0`
 
 prhello-const.o: prhello-const.c
-	$(CC) `pkg-config --cflags gtk+-2.0` $(CFLAGS) -o $@ -c $<
+	$(CC) `pkg-config --cflags gtk+-3.0` $(CFLAGS) -o $@ -c $<
 @end verbatim
 @end example
 
diff --git a/src/configure.ac b/src/configure.ac
index a13e84f11..57ade1fc6 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -167,11 +167,11 @@ if test "${with_gtk}" = "yes"; then
 elif test "${with_gtk}" = "no"; then
     AC_MSG_RESULT([by request... no])
 elif test "${with_gtk}" = "auto"; then
-    if pkg-config --exists gtk+-2.0 2>/dev/null; then
+    if pkg-config --exists gtk+-3.0 2>/dev/null; then
 	AC_MSG_RESULT([yes])
 	with_gtk=yes
     else
-	AC_MSG_RESULT([no Gtk 2.0... no])
+	AC_MSG_RESULT([no Gtk 3.0... no])
 	with_gtk=no
     fi
 fi