[glade3/offscreen-gtk3] Use libgladeui-3 as library name, remove --with-gtk option and adapt Makefiles and configure.in

[Johannes Schmid <jhs src gnome org>]

commit a05805d16445ee710f3a480f3cd238b015b8b2e6
Author: Johannes Schmid <jhs gnome org>
Date:   Thu Nov 18 16:24:58 2010 +0100

    Use libgladeui-3 as library name, remove --with-gtk option and adapt
    Makefiles and configure.in
    
    As we can only build against gtk+-3.0 anyway, we should use a suitable
    library name.

 configure.ac                                  |   35 +++----------------------
 data/{gladeui-1.0.pc.in => gladeui-3.0.pc.in} |    6 ++--
 gladeui/Makefile.am                           |   20 +++++++-------
 src/Makefile.am                               |    2 +-
 4 files changed, 18 insertions(+), 45 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3937147..62b1191 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,36 +121,9 @@ GTK_DOC_CHECK(1.9)
 dnl ================================================================
 dnl Check for gtk+
 dnl ================================================================
-# Which gtk+ API version to compile against
-
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 3.0)])],
-  [case "$with_gtk" in
-     2.0|3.0) ;;
-     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
-   esac],
-  [with_gtk=3.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
-  2.0) GTK_API_VERSION=2.0
-       GTK_REQUIRED=2.14.0
-       ;;
-  3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED=2.90.0
-       ;;
-esac
-
-AC_SUBST(GTK_LIBS)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST([GTK_API_VERSION])
-
-AM_CONDITIONAL([HAVE_GTK_2],[test "$with_gtk" = "2.0"])
-AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
-
+GTK_REQUIRED=2.91.2
 PKG_CHECK_MODULES([GTK],[
-  gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+  gtk+-3.0 >= $GTK_REQUIRED
   libxml-2.0 >= 2.4.0
 ])
 
@@ -238,7 +211,7 @@ fi
 dnl ================================================================
 dnl Check for GDK Quartz and MacOSX integration package 
 dnl ================================================================
-_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
+_gdk_tgt=`$PKG_CONFIG --variable=target gdk-3.0`
 AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
 if test "x$_gdk_tgt" = xquartz; then 
    PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
@@ -271,7 +244,7 @@ AC_SUBST([AM_LDFLAGS])
 
 AC_CONFIG_FILES([
 Makefile
-data/gladeui-1.0.pc
+data/gladeui-3.0.pc
 data/glade-3.desktop.in
 data/Makefile
 data/icons/Makefile
diff --git a/data/gladeui-1.0.pc.in b/data/gladeui-3.0.pc.in
similarity index 75%
rename from data/gladeui-1.0.pc.in
rename to data/gladeui-3.0.pc.in
index a42bafe..2927271 100644
--- a/data/gladeui-1.0.pc.in
+++ b/data/gladeui-3.0.pc.in
@@ -3,7 +3,7 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 datarootdir= datarootdir@
 datadir= datadir@
-includedir= includedir@/libgladeui-1.0
+includedir= includedir@/libgladeui-3.0
 catalogdir= datadir@/@PACKAGE@/catalogs
 pixmapdir= datadir@/@PACKAGE@/pixmaps
 moduledir= libdir@/@PACKAGE@/modules
@@ -13,6 +13,6 @@ Name: Glade
 Description: Glade interface designer library
 URL: http://glade.gnome.org
 Version: @PACKAGE_VERSION@
-Requires: gtk+-2.0 >= 2.14.0 libxml-2.0 >= 2.4.0
-Libs: -L${libdir} -lgladeui-1
+Requires: gtk+-3.0 >= 2.91.2 libxml-2.0 >= 2.4.0
+Libs: -L${libdir} -lgladeui-3
 Cflags: -I${includedir}
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index 6ce8dd8..3a5a861 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -8,14 +8,14 @@ common_defines = \
 	-DGLADE_LOCALEDIR="\"$(datadir)/locale\""\
   -DGLADE_BINDIR="\"$(bindir)\""
 
-lib_LTLIBRARIES = libgladeui-2.la
+lib_LTLIBRARIES = libgladeui-3.la
 
 BUILT_SOURCES = glade-marshallers.c glade-marshallers.h
 
 EXTRA_DIST = glade-marshallers.list gladeui.rc.in icon-naming-spec.c glade-previewer.rc.in
 
 # The glade-3 core library
-libgladeui_2_la_SOURCES = \
+libgladeui_3_la_SOURCES = \
 	glade-widget-adaptor.c \
 	glade-debug.c \
 	glade-project.c \
@@ -60,24 +60,24 @@ libgladeui_2_la_SOURCES = \
 	glade-editor-table.c \
 	glade-cell-renderer-icon.c
 
-libgladeui_2_la_CPPFLAGS =  \
+libgladeui_3_la_CPPFLAGS =  \
 	$(common_defines)   \
 	-I$(top_srcdir)     \
 	-I$(top_builddir)   \
 	$(AM_CPPFLAGS)
 
-libgladeui_2_la_CFLAGS =    \
+libgladeui_3_la_CFLAGS =    \
 	$(GTK_CFLAGS)       \
 	$(IGE_MAC_BUNDLE_FLAG) \
 	$(IGE_MAC_CFLAGS)  \
 	$(WARN_CFLAGS)      \
 	$(AM_CFLAGS)
 
-libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
-libgladeui_2_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
+libgladeui_3_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
+libgladeui_3_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
 
 
-libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui
+libgladeuiincludedir=$(includedir)/libgladeui-3.0/gladeui
 libgladeuiinclude_HEADERS = \
 	glade.h \
 	glade-debug.h \
@@ -117,12 +117,12 @@ libgladeuiinclude_HEADERS = \
 
 
 if PLATFORM_WIN32
-libgladeui_2_la_LDFLAGS += -no-undefined
+libgladeui_3_la_LDFLAGS += -no-undefined
 endif
 
 if NATIVE_WIN32
-libgladeui_2_la_LDFLAGS += -Wl,gladeui-win32-res.o -export-symbols gladeui.def
-libgladeui_2_la_DEPENDENCIES = gladeui-win32-res.o gladeui.def
+libgladeui_3_la_LDFLAGS += -Wl,gladeui-win32-res.o -export-symbols gladeui.def
+libgladeui_3_la_DEPENDENCIES = gladeui-win32-res.o gladeui.def
 endif
 
 gladeui-win32-res.o: gladeui.rc
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b6a13e..fa6f5dc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ glade_CFLAGS =           \
 
 glade_LDFLAGS = $(AM_LDFLAGS)
 
-glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(IGE_MAC_LIBS)
+glade_LDADD = $(top_builddir)/gladeui/libgladeui-3.la $(IGE_MAC_LIBS)
 
 glade_SOURCES = \
 	glade-window.c \