GNOME.org
 

sawfish r4438 - in branches/sawfish-1.3: . man

Author: chrisb
Date: Thu Mar  5 19:09:07 2009
New Revision: 4438
URL: http://svn.gnome.org/viewvc/sawfish?rev=4438&view=rev

Log:
	* configure.in: bump version to 1.3.5.2
                        bump minimum librep to 0.17.3
                        bump minimum rep-gtk to 0.18.4
                        fix templates
                        add AC_CONFIG_MACRO_DIR([m4])
                        add AM_PROG_LIBTOOL

        * autogen.sh: take from upstream svn (fixes libtool issues


Modified:
   branches/sawfish-1.3/ChangeLog
   branches/sawfish-1.3/autogen.sh
   branches/sawfish-1.3/configure.in
   branches/sawfish-1.3/man/news.texi

Modified: branches/sawfish-1.3/autogen.sh
==============================================================================
--- branches/sawfish-1.3/autogen.sh	(original)
+++ branches/sawfish-1.3/autogen.sh	Thu Mar  5 19:09:07 2009
@@ -1,22 +1,35 @@
 #!/bin/sh
 
+if [ -f Makefile ]; then
+	make distclean
+fi
+
+if [ -f aclocal.m4 ]; then
+	rm -fv aclocal.m4
+fi
+
+if [ -d m4 ]; then
+	rm -fv m4/*
+fi
+
 if [ -f configure.in ]; then
-  if grep "A[MC]_CONFIG_HEADER" configure.in >/dev/null; then
-    if [ ! -f config.h.in ]; then
+  if grep "AC_CONFIG_HEADER" configure.in >/dev/null; then
       echo "Running autoheader"
       autoheader || exit 1
-    fi
   fi
   if grep "AM_PROG_LIBTOOL" configure.in >/dev/null; then
     echo "Running libtoolize"
-    libtoolize || exit 1
+    lver=$(libtool --version | grep 1.5)
+    if [ "x${lver}" != "x" ]; then
+	    libtoolize --force --copy || exit 1
+    else    libtoolize --force --copy --install || exit 1
+    fi
   fi
   echo "Running aclocal $ACLOCAL_FLAGS"
-  aclocal $ACLOCAL_FLAGS || exit 1
+  aclocal -I m4 $ACLOCAL_FLAGS || exit 1
 
   echo "Running autoconf $AUTOCONF_FLAGS"
   autoconf $AUTOCONF_FLAGS || exit 1
 fi
 
-./configure "$@" && ( echo ; echo "Now type \`make' to compile." )
-
+./configure "$@"

Modified: branches/sawfish-1.3/configure.in
==============================================================================
--- branches/sawfish-1.3/configure.in	(original)
+++ branches/sawfish-1.3/configure.in	Thu Mar  5 19:09:07 2009
@@ -24,8 +24,11 @@
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR(etc)
 
+AM_PROG_LIBTOOL
+AC_CONFIG_MACRO_DIR([m4])
+
 dnl Release versioning info
-version="1.3.5"
+version="1.3.5.2"
 subversion=""
 
 output_files="src/Makefile lisp/Makefile scripts/Makefile themes/Makefile\
@@ -145,32 +148,26 @@
    fi], [: nothing])
 
 dnl Check for librep
-AM_PATH_REP(0.17)
-
-rep_gtk_function=gtk-widget-set-size-request
-rep_gtk_version=0.18.3
+REP_MIN_VER="0.17.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
+PKG_CHECK_MODULES(LIBREP, librep >= ${REP_MIN_VER}
+		  ,REP_EXECDIR="`pkg-config --variable=repcommonexecdir librep`"
+		  REP_CFLAGS="`pkg-config --cflags librep`"
+		  REP_LIBS="`pkg-config --libs librep`"
+		  REP_MSGFMT="`which msgfmt`"
+		  REP_VERSION="`pkg-config --variable=version librep`"
+		  ,AC_MSG_ERROR([can not locate librep]))
+
+dnl Check for rep-gtk
+REP_GTK_MIN_VER="0.18.4"
+
+PKG_CHECK_MODULES(REP_GTK, rep-gtk >= 0.18.4
+		  ,
+		  ,AC_MSG_ERROR([can not locate rep-gtk]))
 
 dnl is X available?
 if test "${no_x}" != "yes"; then
-  AC_DEFINE(HAVE_X11)
+  AC_DEFINE(HAVE_X11,1,[have x11])
 else
   AC_MSG_ERROR([You need X11 for sawfish])
 fi
@@ -187,8 +184,8 @@
     AC_SUBST(GDK_PIXBUF_VERSION)
     AC_SUBST(GDK_PIXBUF_CFLAGS)
     AC_SUBST(GDK_PIXBUF_LIBS)
-    AC_DEFINE(HAVE_GDK_PIXBUF,1)
-    AC_DEFINE(NEED_PIXMAP_CACHE,1)
+    AC_DEFINE(HAVE_GDK_PIXBUF,1,[gdk pixbuf])
+    AC_DEFINE(NEED_PIXMAP_CACHE,1,[pixmap cache])
     IMAGE_LIBS='${GDK_PIXBUF_LIBS}'
     IMAGE_CFLAGS='${GDK_PIXBUF_CFLAGS}'
     with_gdk_pixbuf=yes
@@ -215,7 +212,7 @@
     if $IMLIB_CONFIG --libs | grep " -lpng" >/dev/null 2>&1; then true; else
       AC_MSG_ERROR([imlib must be built with support for png images])
     fi
-    AC_DEFINE(HAVE_IMLIB,1)
+    AC_DEFINE(HAVE_IMLIB,1,[have imlib])
     IMAGE_LIBS='${IMLIB_LIBS}'
     IMAGE_CFLAGS='${IMLIB_CFLAGS}'
     AC_SUBST(IMLIB_VERSION)
@@ -235,7 +232,7 @@
     PKG_CHECK_MODULES(AUDIOFILE, audiofile >= 0.2.3)
     AC_SUBST(AUDIOFILE_LIBS)
     AC_SUBST(AUDIOFILE_CFLAGS)
-    AC_DEFINE(HAVE_LIBAUDIOFILE)
+    AC_DEFINE(HAVE_LIBAUDIOFILE,1,[have libaudiofile])
 fi
 
 AC_ARG_WITH(esd,
@@ -245,7 +242,7 @@
     PKG_CHECK_MODULES(ESD, esound >= 0.2.23)
     AC_SUBST(ESD_LIBS)
     AC_SUBST(ESD_CFLAGS)
-    AC_DEFINE(HAVE_ESD)
+    AC_DEFINE(HAVE_ESD,1,[Have esound])
 fi
 
 AC_ARG_ENABLE(gnome-widgets,
@@ -276,10 +273,10 @@
   dnl We used to compile our own version of dlmalloc on most
   dnl platforms that didn't have it in their libc. But the list
   dnl of exceptions was growing too long..
-  AC_DEFINE(LIBC_MALLOC)
+  AC_DEFINE(LIBC_MALLOC,1,[libc malloc])
 else
-  AC_DEFINE(DOUG_LEA_MALLOC)
-  AC_DEFINE(LIBC_MALLOC)
+  AC_DEFINE(DOUG_LEA_MALLOC,1,[Doug Lea malloc])
+  AC_DEFINE(LIBC_MALLOC,1,[libc malloc])
 fi
 
 dnl Check for GNOME location
@@ -367,6 +364,11 @@
 AC_SUBST(X_EXTRA_LIBS)
 AC_SUBST(IMLIB_CFLAGS)
 AC_SUBST(IMLIB_LIBS)
+AC_SUBST(REP_EXECDIR)
+AC_SUBST(REP_CFLAGS)
+AC_SUBST(REP_LIBS)
+AC_SUBST(REP_VERSION)
+AC_SUBST(REP_MSGFMT)
 
 dnl Build all files
 AC_OUTPUT(${output_files})

Modified: branches/sawfish-1.3/man/news.texi
==============================================================================
--- branches/sawfish-1.3/man/news.texi	(original)
+++ branches/sawfish-1.3/man/news.texi	Thu Mar  5 19:09:07 2009
@@ -6,6 +6,33 @@
 they occurred between. For more detailed information see the
 @file{ChangeLog} files in the Sawfish source tree.
 
+ heading 1.3.5.2
+
+ itemize @bullet
+
+ item New/Updated Requirements:
+ itemize @minus
+
+ item librep 0.17 -> 0.17.3
+
+ item rep-gtk 0.18.3 -> 0.18.4
+ end itemize
+
+ item Fixes:
+ itemize @minus
+
+ item allow compilation with librep 0.17.3
+
+ item fix templates in configure.in (fixes autoheader issue)
+
+ item add AC_CONFIG_MACRO_DIR([m4]) to shut up libtool
+
+ item add AM_PROG_LIBTOOL for autogen.sh to run libtoolize
+
+ item new autogen.sh (take from upstream svn) to solve libtool 1.5/2.2 issues
+ end itemize
+ end itemize
+
 @heading 1.3.5.1
 
 @itemize @bullet
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]