rep-gtk r418 - trunk

[chrisb svn gnome org]

Author: chrisb
Date: Wed Apr  1 13:51:07 2009
New Revision: 418
URL: http://svn.gnome.org/viewvc/rep-gtk?rev=418&view=rev

Log:
fixed libdir issue
small work on autotols


Modified:
   trunk/ChangeLog
   trunk/Makefile.in
   trunk/NEWS
   trunk/configure.in

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Wed Apr  1 13:51:07 2009
@@ -15,6 +15,9 @@
 host_type= host@
 SHELL=/bin/sh
 
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
 datarootdir= datarootdir@
 
 repexecdir= REP_EXECDIR@
@@ -36,8 +39,6 @@
 DESTDIR=
 installdir=$(repexecdir)
 
-libdir= prefix@/@libdir@
-
 top_srcdir= top_srcdir@
 top_builddir=.
 VPATH= top_srcdir@:.

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Apr  1 13:51:07 2009
@@ -1,6 +1,8 @@
 0.18.5:
 	- bump minimum gtk+ to 2.15.5
 	- don't ignore datarootdir setting
+	- fix libdir issue
+	- improved configures ending message
 
 0.18.4:
 	- small code cleanup

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Apr  1 13:51:07 2009
@@ -110,7 +110,11 @@
 
 REP_VERSION="`pkg-config --modversion librep`"
 GLIB_VERSION="`pkg-config --modversion glib-2.0`"
-CAIRO_VERSION="`pkg-config --modversion cairo`"
+
+if $PKG_CONFIG --exists cairo; then
+	CAIRO_VERSION="`pkg-config --modversion cairo`"
+fi
+
 GTK_VERSION="`pkg-config --modversion gtk+-2.0`"
 
 echo "
@@ -129,13 +133,20 @@
   
   compiler:	$CC
   cflags:	$CFLAGS $DEVELOPMENT_CFLAGS
-  
+  preprocessor:	$CPP
+  cppflags:	$CPPFLAGS
+  ldflags:	$LDFLAGS
+  makeflags:	$MAKEFLAGS
+
   == == == == == == == == == == == == ==
   
   rep:		$REP_VERSION
-  glib:		$GLIB_VERSION
-  cairo:	$CAIRO_VERSION
-  gtk+:		$GTK_VERSION
+  glib:		$GLIB_VERSION"
+
+if $PKG_CONFIG --exists cairo; then
+	echo "  cairo:	$CAIRO_VERSION"
+fi
+echo "  gtk+:		$GTK_VERSION
  
   == == == == == == == == == == == == ==
 "