sawfish r4320 - trunk

[chrisb svn gnome org]

Author: chrisb
Date: Sat Dec 20 08:48:08 2008
New Revision: 4320
URL: http://svn.gnome.org/viewvc/sawfish?rev=4320&view=rev

Log:
bump version to 1.5.0
bump minimum librep to 0.17.3 and rep-gtk to 0.18.4
(since rep.m4 has been dropped in favour of improved librep.pc/rep-gtk.pc)


Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Dec 20 08:48:08 2008
@@ -25,7 +25,7 @@
 AC_CONFIG_AUX_DIR(etc)
 
 dnl Release versioning info
-version="1.3.5"
+version="1.5.0"
 subversion=""
 
 output_files="src/Makefile lisp/Makefile scripts/Makefile themes/Makefile\
@@ -145,28 +145,19 @@
    fi], [: nothing])
 
 dnl Check for librep
-AM_PATH_REP(0.17)
+PKG_CHECK_MODULES(LIBREP, librep >= 0.17.3)
+REP_EXECDIR="`pkg-config --variable=repcommonexecdir librep`"
+REP_CFLAGS="`pkg-config --cflags librep`"
+REP_LIBS="`pkg-config --libs librep`"
+REP_MSGFMT="`which msgfmt`"
+
+AC_SUBST(REP_EXECDIR)
+AC_SUBST(REP_CFLAGS)
+AC_SUBST(REP_LIBS)
+AC_SUBST(REP_MSGFMT)
 
-rep_gtk_function=gtk-widget-set-size-request
-rep_gtk_version=0.18.3
-
-AC_MSG_CHECKING([for rep-gtk >= $rep_gtk_version])
-cat >conftest <<EOF
-(condition-case nil
-    (progn
-      (require 'gui.gtk-2.gtk)
-      $rep_gtk_function
-      (throw 'quit 0))
-  (error
-    (throw 'quit 1)))
-EOF
-if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([You need rep-gtk version ${rep_gtk_version}+])
-fi
-rm -f conftest
+dnl Check for rep-gtk
+PKG_CHECK_MODULES(REP_GTK, rep-gtk >= 0.18.4)
 
 dnl is X available?
 if test "${no_x}" != "yes"; then