rep-gtk r352 - trunk

[chrisb svn gnome org]

Author: chrisb
Date: Thu Jul 31 19:37:57 2008
New Revision: 352
URL: http://svn.gnome.org/viewvc/rep-gtk?rev=352&view=rev

Log:
- added rep-gtk.pc.in
- reworked configure.in


Added:
   trunk/rep-gtk.pc.in
Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jul 31 19:37:57 2008
@@ -24,7 +24,7 @@
 AC_CONFIG_HEADER(config.h)
 
 dnl Release versioning info
-version="0.18"
+version="0.18.1"
 
 OUT="gtk-2/types.la gtk-2/gtk.la"
 AC_SUBST(OUT)
@@ -39,6 +39,7 @@
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_GCC_TRADITIONAL
+AC_PROG_LIBTOOL
 
 dnl If using GCC and it doesn't look as though the cflags have been
 dnl set explicitly, add some warning options. Turn off implicit-int
@@ -48,15 +49,17 @@
 fi
 
 dnl Check for librep
-AM_PATH_REP(0.13)
+AM_PATH_REP(0.17)
 
 dnl Check for glib
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6)
 
 dnl Check for GTK
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.3,,AC_ERROR(need at least Gtk+ version 1.3))
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6,,AC_ERROR(need at least Gtk+ version 2.6))
 
-PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 1.3.11)
+PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 2.6)
+
+pc_libs="gtk+-2.0 gdk-pixbuf-2.0"
 
 dnl Check for libgnome
 AC_MSG_CHECKING([for GNOME libs])
@@ -82,6 +85,12 @@
     with_gnome=no
   fi
 fi
+
+if [[ $with_gnome == yes ]]; then
+	pc_libs="$pc_libs libgnome-2.0 libgnomeui-2.0 libgnomecanvas-2.0"
+fi
+	
+
 AC_SUBST(GNOME_VERSION)
 AC_SUBST(GNOME_LIBS)
 AC_SUBST(GNOME_CFLAGS)
@@ -90,15 +99,25 @@
 AC_SUBST(GNOME_CANVAS_LIBS)
 AC_SUBST(GNOME_CANVAS_CFLAGS)
 
+AC_ARG_ENABLE(paranoia, 	[  --enable-paranoia       use wall, wno-error, ansi, pedantic compiler flags],	[paranoia=$enableval],	[paranoia="no"])
+
+if test $paranoia = "yes"; then
+	DEVELOPMENT_CFLAGS+=" -Wall -Wno-error -ansi -pedantic"
+fi
+
 dnl Check for libglade
 AC_ARG_WITH(libglade,
  [  --with-libglade         Build libglade wrappers (dynamic GUI builder)
   --without-libglade      Don't wrap libglade], [], [with_libglade=yes])
 if test "$with_libglade" = "yes"; then
-  PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 1.99,
+  PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 2.4,
 		    [OUT="$OUT gtk-2/libglade.la"])
 fi
 
+if [[ $with_libglade == yes ]]; then
+	pc_libs="$pc_libs libglade-2.0"
+fi
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
@@ -116,14 +135,74 @@
 
 dnl Nonstandard exported symbols
 AC_SUBST(version)
+AC_SUBST(pc_libs)
 AC_SUBST(repexecdir)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
 
-AC_DEFINE_UNQUOTED(REP_GTK_VERSION, "${version}")
+AC_DEFINE_UNQUOTED([REP_GTK_VERSION], "${version}", [Version of rep-gtk]) 
 
-AC_OUTPUT(Makefile rep-gtk.spec)
+AC_CONFIG_FILES([
+Makefile
+rep-gtk.pc
+rep-gtk.spec
+])
+
+AC_OUTPUT
+
+REP_VERSION="`rep --version | gawk '{ print $3 }'`"
+GLIB_VERSION="`pkg-config --modversion glib-2.0`"
+CAIRO_VERSION="`pkg-config --modversion cairo`"
+GTK_VERSION="`pkg-config --modversion gtk+-2.0`"
+GNOME_VERSION="`pkg-config --modversion libgnome-2.0`"
+GNOME_UI_VERSION="`pkg-config --modversion libgnomeui-2.0`"
+GNOME_CANVAS_VERSION="`pkg-config --modversion libgnomecanvas-2.0`"
+GLADE_VERSION="`pkg-config --modversion libglade-2.0`"
+GCC_VERSION="`$CC --version | grep gcc | gawk '{ print $4 }'`"
+
+AC_SUBST(DEVELOPMENT_CFLAGS)
+
+echo "
+  == == == == == == == == == == == == ==
+  
+  rep-gtk:	$version
+  
+  == == == == == == == == == == == == ==
+  
+  prefix:	$prefix
+  exec_prefix:	$exec_prefix
+  libdir:	$libdir
+  libexecdir:	$libexecdir
+  
+  == == == == == == == == == == == == ==
+  
+  compiler:	$CC"
+
+if [[ $GCC_VERSION != "" ]]; then \
+	echo "  cc-version:	$GCC_VERSION"
+fi
+
+echo "  cflags:	$CFLAGS $DEVELOPMENT_CFLAGS
+  
+  == == == == == == == == == == == == ==
+  
+  rep:		$REP_VERSION
+  glib:		$GLIB_VERSION
+  cairo:	$CAIRO_VERSION
+  gtk+:		$GTK_VERSION"
+
+if [[ $with_gnome == yes ]]; then
+	echo "  gnome:	$GNOME_VERSION
+  gnomeui:	$GNOME_UI_VERSION
+  gnome-canvas:	$GNOME_CANVAS_VERSION"
+fi
+if [[ $with_libglade == yes ]]; then
+	echo "  glade:	$GLADE_VERSION"
+fi
+echo "  
+  == == == == == == == == == == == == ==
+"
 
 dnl Local variables:
 dnl major-mode: sh-mode

Added: trunk/rep-gtk.pc.in
==============================================================================
--- (empty file)
+++ trunk/rep-gtk.pc.in	Thu Jul 31 19:37:57 2008
@@ -0,0 +1,9 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: rep-gtk
+Description: GTK+ bindings to librep
+Version: @version@
+Requires: @pc_libs@