GNOME.org
 

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

Author: chrisb
Date: Wed Apr  1 14:07:19 2009
New Revision: 4456
URL: http://svn.gnome.org/viewvc/sawfish?rev=4456&view=rev

Log:
configure.in and build-info taken from upstream


Modified:
   branches/sawfish-1.3/ChangeLog
   branches/sawfish-1.3/build-info
   branches/sawfish-1.3/config.h.in
   branches/sawfish-1.3/configure.in
   branches/sawfish-1.3/man/news.texi

Modified: branches/sawfish-1.3/build-info
==============================================================================
--- branches/sawfish-1.3/build-info	(original)
+++ branches/sawfish-1.3/build-info	Wed Apr  1 14:07:19 2009
@@ -24,7 +24,7 @@
 build_date="`date +'%a %b %e %Y'`"
 build_time="`date +'%T %Z'`"
 
-cat >build.h <<EOF
+cat >src/build.h <<EOF
 /* build.h -- Definitions relating to the current build
    Automatically generated by build-info; DO NOT EDIT! */
 

Modified: branches/sawfish-1.3/config.h.in
==============================================================================
--- branches/sawfish-1.3/config.h.in	(original)
+++ branches/sawfish-1.3/config.h.in	Wed Apr  1 14:07:19 2009
@@ -1,8 +1,5 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
@@ -24,13 +21,13 @@
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
-/* Have esound */
+/* Have ESD */
 #undef HAVE_ESD
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* gdk pixbuf */
+/* Have gdk-pixbuf */
 #undef HAVE_GDK_PIXBUF
 
 /* Define to 1 if you have the `gethostname' function. */
@@ -39,13 +36,16 @@
 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
-/* have imlib */
+/* Have GTK */
+#undef HAVE_GTK
+
+/* Have Imlib1 */
 #undef HAVE_IMLIB
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* have libaudiofile */
+/* Have libaudiofile */
 #undef HAVE_LIBAUDIOFILE
 
 /* Define to 1 if you have the `nsl' library (-lnsl). */
@@ -57,6 +57,15 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Have pango */
+#undef HAVE_PANGO
+
+/* Have pangox */
+#undef HAVE_PANGO_X
+
+/* Have pangoxft */
+#undef HAVE_PANGO_XFT
+
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
@@ -96,7 +105,7 @@
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
-/* have x11 */
+/* Have X11 */
 #undef HAVE_X11
 
 /* Define to 1 if you have the <X11/extensions/Xdbe.h> header file. */
@@ -108,13 +117,19 @@
 /* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */
 #undef HAVE_X11_EXTENSIONS_XRANDR_H
 
+/* Define to 1 if you have the <X11/ICE/ICE.h> header file. */
+#undef HAVE_X11_ICE_ICE_H
+
 /* Define to 1 if you have the <X11/SM/SMlib.h> header file. */
 #undef HAVE_X11_SM_SMLIB_H
 
+/* Have xft */
+#undef HAVE_X11_XFT_XFT_H
+
 /* libc malloc */
 #undef LIBC_MALLOC
 
-/* pixmap cache */
+/* Need pixmap cache */
 #undef NEED_PIXMAP_CACHE
 
 /* Define to the address where bug reports for this package should be sent. */
@@ -146,19 +161,11 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
 
-/* Define to 1 if the X Window System is missing or not being used. */
+/* Have x11 */
 #undef X_DISPLAY_MISSING
 
 /* Define to empty if `const' does not conform to ANSI C. */

Modified: branches/sawfish-1.3/configure.in
==============================================================================
--- branches/sawfish-1.3/configure.in	(original)
+++ branches/sawfish-1.3/configure.in	Wed Apr  1 14:07:19 2009
@@ -2,58 +2,41 @@
 dnl  Copyright (C) 1998 John Harper <john dcs warwick ac uk>
 dnl  $Id: configure.in,v 1.140 2008/02/18 20:59:59 jkozicki Exp $
 dnl
-dnl  This file is part of sawmill.
+dnl  This file is part of sawfish.
 dnl
-dnl  sawmill is free software; you can redistribute it and/or modify it
+dnl  sawfish is free software; you can redistribute it and/or modify it
 dnl  under the terms of the GNU General Public License as published by
 dnl  the Free Software Foundation; either version 2, or (at your option)
 dnl  any later version.
 dnl
-dnl  sawmill is distributed in the hope that it will be useful, but
+dnl  sawfish is distributed in the hope that it will be useful, but
 dnl  WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl  GNU General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU General Public License
-dnl  along with sawmill; see the file COPYING.  If not, write to
+dnl  along with sawfish; see the file COPYING.  If not, write to
 dnl  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 AC_REVISION($Revision: 1.141 $)
-
 AC_INIT(src/sawmill.h)
-AC_CONFIG_HEADER(config.h)
 
-AM_PROG_LIBTOOL
+AC_CONFIG_HEADER(config.h)
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_SUBST(datarootdir)
+AM_PROG_LIBTOOL
 
 dnl Release versioning info
 version="1.3.5.3"
 subversion=""
 
-output_files="src/Makefile lisp/Makefile scripts/Makefile themes/Makefile\
- lisp/sawfish/ui/Makefile lisp/sawfish/gtk/Makefile sounds/Makefile\
- man/Makefile po/Makefile Makedefs Makefile sawfish.spec\
- lisp/sawfish/gtk/widgets/font.jl"
-
 SUBDIRS="src lisp scripts themes sounds man po"
 AC_SUBST(SUBDIRS)
 
-add_subdir () {
-  sub=$1; shift
-  SUBDIRS="$SUBDIRS $sub"
-  output_files="$output_files $sub/Makefile"
-  for ext in $*; do
-    output_files="$output_files $sub/$ext"
-  done
-  unset sub
-}
-
-dnl Find the system type
-AC_CANONICAL_HOST
+AC_SUBST(datarootdir)
 
 dnl Remove trailing slash in $prefix if necessary
+dnl /usr// is the same than /usr/ ... so why would we need this?
 case "${prefix}" in
   */)
     prefix=`echo ${prefix} | sed -e 's/^\(.*\)\/$/\1/'`
@@ -65,36 +48,28 @@
 localedir='${datadir}/locale'
 sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
 
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_GCC_TRADITIONAL
-
-dnl Workaround etc/install-sh not being found from subdirectories
-if test "$INSTALL" = "$ac_install_sh"; then
-  dnl Why is the backslash needed?
-  INSTALL='\${top_srcdir}/etc/install-sh -c'
-fi
-
 dnl Checks for libraries.
 AC_CHECK_LIB(nsl, xdr_void)
 AC_CHECK_LIB(socket, bind)
 
-dnl Checks for header files.
-AC_PATH_XTRA
-AC_HEADER_STDC
-AC_HEADER_TIME
+dnl Checks for headers
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h sys/time.h sys/utsname.h unistd.h memory.h)
+AC_HEADER_TIME
+AC_CHECK_HEADERS(fcntl.h sys/time.h sys/utsname.h)
+
+AC_PATH_PROG(PKG_CONFIG, [pkg-config], [no])
 
 dnl Check for X headers, etc
 _cppflags="${CPPFLAGS}"
 CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
 
-AC_CHECK_HEADERS(X11/SM/SMlib.h X11/extensions/Xdbe.h, [], [], [#include <X11/Xlib.h> ])
+AC_ARG_WITH(xorg-x11r7,
+	    [  --with-xorg-x11r7	  Use X.Org X11R7
+	     --without-xorg-x11r7	  Use X.Org/XFree86 X11R6 instead], [], [with_xorg_x11r7=yes])
+
+if test "$with_xorg_x11r7" != "no"; then
+
+AC_CHECK_HEADERS(X11/extensions/Xdbe.h, [], [], [#include <X11/Xlib.h> ])
 
 dnl Checks for X extensions/libraries
 XINERAMA_LIBS=""
@@ -102,10 +77,57 @@
 XFT_LIBS=""
 XFT_CFLAGS=""
 
-AC_SUBST(XINERAMA_LIBS)
-AC_SUBST(XRANDR_LIBS)
-AC_SUBST(XFT_LIBS)
-AC_SUBST(XFT_CFLAGS)
+PKG_CHECK_MODULES(libXineRama, xinerama >= 1.0
+		  ,XINERAMA_LIBS="-lXinerama"
+		  AC_DEFINE(HAVE_X11_EXTENSIONS_XINERAMA_H, 1, [Have xinerama])
+		  ,AC_MSG_ERROR([can not locate libXineRama]))
+
+PKG_CHECK_MODULES(libXRandR, xrandr >= 1.0
+		  ,XRANDR_LIBS="-lXrandr"
+		  AC_DEFINE(HAVE_X11_EXTENSIONS_XRANDR_H, 1, [Have xrandr])
+		  ,AC_MSG_ERROR([can not locate libXRandR]))
+
+PKG_CHECK_MODULES(libXft, xft >= 1.0
+		  ,XFT_LIBS="-lXft"
+		  XFT_CFLAGS="`pkg-config --cflags xft`"
+		  AC_DEFINE(HAVE_X11_XFT_XFT_H, 1, [Have xft])
+		  ,AC_MSG_ERROR([can not locate libXft]))
+
+dnl is X available?
+X_LIBS=""
+
+PKG_CHECK_MODULES(libX11, x11 >= 1.0
+		  ,AC_DEFINE(HAVE_X11, 1, [Have X11])
+		  X_LIBS="`pkg-config --libs x11`"
+		  X_CFLAGS="`pkg-config --cflags x11`"
+		  AC_DEFINE(X_DISPLAY_MISSING, 0, [Have x11])
+		  ,AC_MSG_ERROR([can not locate libX11]))
+
+X_LIBS="${X_LIBS} -lXext -lXrender"
+
+X_EXTRA_LIBS=""
+
+PKG_CHECK_MODULES(libICE, ice >= 1.0
+		  ,X_EXTRA_LIBS="${X_EXTRA_LIBS} -lICE"
+		  ,AC_MSG_ERROR([can't locate libICE]))
+
+PKG_CHECK_MODULES(libSM, sm >= 1.0
+		  ,X_EXTRA_LIBS="${X_EXTRA_LIBS} -lSM"
+		  ,AC_MSG_ERROR([can't locate libSM]))
+
+X_SERVER="X.Org X11R7"
+
+CPPFLAGS="${_cppflags}"
+
+else
+
+AC_CHECK_HEADERS(X11/ICE/ICE.h X11/SM/SMlib.h X11/extensions/Xdbe.h, [], [], [#include <X11/Xlib.h> ])
+
+dnl Checks for X extensions/libraries
+XINERAMA_LIBS=""
+XRANDR_LIBS=""
+XFT_LIBS=""
+XFT_CFLAGS=""
 
 AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
 	     [XINERAMA_LIBS="-lXinerama"
@@ -114,7 +136,7 @@
 
 AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
 	     [XRANDR_LIBS="-lXrandr"
-	      AC_CHECK_HEADERS(X11/extensions/Xrandr.h, [], [], 
+	      AC_CHECK_HEADERS(X11/extensions/Xrandr.h, [], [],
 	         [#include <X11/Xlib.h> ])],
 	     [],[$X_LIBS -lX11 -lXext])
 
@@ -130,23 +152,40 @@
 	       AC_CHECK_HEADERS(X11/Xft/Xft.h)],
 	       [], [$X_LIBS -lX11 -lXext])])
 
+dnl is X available?
+if test "${no_x}" != "yes"; then
+  AC_DEFINE(HAVE_X11)
+  X_LIBS="${X_LIBS} -lXext -lXrender -lSM -lICE"
+  X_EXTRA_LIBS=""
+else
+  AC_MSG_ERROR([You need X11 for sawfish])
+fi
+
+X_SERVER="X.Org/XFree86 X11R6"
+
 CPPFLAGS="${_cppflags}"
 
+fi
+
 dnl Checks for pango
-PKG_CHECK_MODULES(PANGO, pango >= 1.8.0,
-  [if $PKG_CONFIG --exists pangoxft; then
-     AC_DEFINE(HAVE_PANGO_XFT, 1)
-     PANGO_MODULES="pangoxft pangox"
-     dnl for sawfish.gtk.widgets.font
-     have_pango_xft=yes
-     AC_SUBST(have_pango_xft)
-   fi
-   if test "x$PANGO_MODULES" != x; then
-     AC_DEFINE(HAVE_PANGO, 1)
-     AC_DEFINE(HAVE_PANGO_X, 1)
-     PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_MODULES`
-     PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_MODULES`
-   fi], [: nothing])
+PANGO_MIN_VER="1.8.0"
+
+PANGO_MODULES="pango "
+
+PKG_CHECK_MODULES(PANGO, pango >= ${PANGO_MIN_VER}
+		  ,AC_DEFINE(HAVE_PANGO, 1, [Have pango])
+		  ,AC_MSG_ERROR([can not locate pango]))
+
+PKG_CHECK_MODULES(PANGOX, pangox >= ${PANGO_MIN_VER}
+		  ,AC_DEFINE(HAVE_PANGO_X, 1, [Have pangox]) PANGO_MODULES="${PANGO_MODULES} pangox"
+		  ,AC_MSG_WARN([pango x support not available]))
+
+PKG_CHECK_MODULES(PANGOXFT, pangoxft >= ${PANGO_MIN_VER}
+		  ,AC_DEFINE(HAVE_PANGO_XFT, 1, [Have pangoxft]) PANGO_MODULES="${PANGO_MODULES} pangoxft" have_pango_xft="yes" AC_SUBST(have_pango_xft)
+		  ,AC_MSG_WARN([pango xft support not available]))
+
+PANGO_LIBS=`pkg-config --libs $PANGO_MODULES`
+PANGO_CFLAGS=`pkg-config --cflags $PANGO_MODULES`
 
 dnl Check for librep
 REP_MIN_VER="0.17.3"
@@ -166,84 +205,74 @@
 		  ,
 		  ,AC_MSG_ERROR([can not locate rep-gtk]))
 
-dnl is X available?
-if test "${no_x}" != "yes"; then
-  AC_DEFINE(HAVE_X11,1,[have x11])
-else
-  AC_MSG_ERROR([You need X11 for sawfish])
-fi
+dnl Check for GTK+2
+GTK_MIN_VER="2.6.0"
+
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= ${GTK_MIN_VER}
+		  ,GTK_LIBS="`pkg-config --libs gtk+-2.0`"
+		  GTK_CFLAGS="`pkg-config --cflags gtk+-2.0`"
+		  AC_DEFINE(HAVE_GTK, 1, [Have GTK])
+		  ,AC_MSG_ERROR([can not locate gtk+2]))
 
 dnl Check for image handling libraries
 AC_ARG_WITH(gdk-pixbuf,
- [  --with-gdk-pixbuf	  Use gdk-pixbuf for image management
-  --without-gdk-pixbuf	  Use Imlib1 instead], [],
- [with_gdk_pixbuf=yes])
+	    [  --with-gdk-pixbuf	  Use gdk-pixbuf for image management
+	     --without-gdk-pixbuf	  Use Imlib1 instead], [], [with_gdk_pixbuf=yes])
+
 if test "$with_gdk_pixbuf" != "no"; then
-  AC_MSG_CHECKING([for gdk_pixbuf (xlib version)])
-    PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-xlib-2.0 >= 2.6.0)
-    GDK_PIXBUF_VERSION=`pkg-config --modversion gdk-pixbuf-xlib-2.0`
-    AC_SUBST(GDK_PIXBUF_VERSION)
-    AC_SUBST(GDK_PIXBUF_CFLAGS)
-    AC_SUBST(GDK_PIXBUF_LIBS)
-    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
-  else
-    AC_MSG_RESULT(no)
-    if test "$with_gdk_pixbuf" = "yes"; then
-      AC_MSG_ERROR([can't locate gdk-pixbuf-xlib library])
-    else
-      with_gdk_pixbuf=no
-    fi
+	PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-xlib-2.0 >= ${GTK_MIN_VER}
+			  ,GDK_PIXBUF_CFLAGS="`pkg-config --cflags gdk-pixbuf-xlib-2.0`"
+			  GDK_PIXBUF_LIBS="`pkg-config --libs gdk-pixbuf-xlib-2.0`"
+			  AC_DEFINE(HAVE_GDK_PIXBUF, 1, [Have gdk-pixbuf])
+			  AC_DEFINE(NEED_PIXMAP_CACHE, 1, [Need pixmap cache])
+			  IMAGE_LIBS='${GDK_PIXBUF_LIBS}'
+			  IMAGE_CFLAGS='${GDK_PIXBUF_CFLAGS}'
+			  IMAGE_LOADER=gdk
+			  with_gdk_pixbuf=yes
+			  ,AC_MSG_ERROR([can not locate gdk-pixbuf-xlib])
+			  with_gdk_pixbuf=no)
 fi
+
 if test "$with_gdk_pixbuf" = "no"; then
-  AC_PATH_PROG(IMLIB_CONFIG, imlib-config, no)
-  AC_MSG_CHECKING([for Imlib])
-  if test "$IMLIB_CONFIG" = "no"; then
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([can't find imlib-config])
-  else
-    IMLIB_VERSION=`$IMLIB_CONFIG --version`
-    dnl XXX do version check..
-    AC_MSG_RESULT([version $IMLIB_VERSION])
-    IMLIB_CFLAGS=`$IMLIB_CONFIG --cflags`
-    IMLIB_LIBS=`$IMLIB_CONFIG --libs`
-    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,[have imlib])
-    IMAGE_LIBS='${IMLIB_LIBS}'
-    IMAGE_CFLAGS='${IMLIB_CFLAGS}'
-    AC_SUBST(IMLIB_VERSION)
-    AC_SUBST(IMLIB_CFLAGS)
-    AC_SUBST(IMLIB_LIBS)
-  fi
+	PKG_CHECK_MODULES(IMLIB1, imlib >= 1.9
+			  ,IMLIB_CFLAGS="`pkg-config --cflags imlib`"
+			  IMLIB_LIBS="`pkg-config --libs imlib`"
+			  AC_DEFINE(HAVE_IMLIB, 1, [Have Imlib1])
+			  IMAGE_LIBS='${IMLIB1_LIBS}'
+			  IMAGE_CFLAGS='${IMLIB1_CFLAGS}'
+			  IMLIB_VERSION="`pkg-config --modversion imlib`"
+			  IMAGE_LOADER=imlib1
+			  ,AC_MSG_ERROR([can not locate imlib1 library]))
 fi
-AC_SUBST(IMAGE_LIBS)
-AC_SUBST(IMAGE_CFLAGS)
 
-AM_PATH_GTK_2_0(2.6.0)
+dnl Check for libaudiofile
+AUDIOFILE_MIN_VER="0.2.3"
 
 AC_ARG_WITH(audiofile,
- [  --with-audiofile	  Use libaudiofile for sound manipulation
-  --without-audiofile], [], [with_audiofile=yes])
+	    [  --with-audiofile	  Use libaudiofile for sound manipulation
+	     --without-audiofile], [], [with_audiofile=yes])
+
 if test "$with_audiofile" = "yes"; then
-    PKG_CHECK_MODULES(AUDIOFILE, audiofile >= 0.2.3)
-    AC_SUBST(AUDIOFILE_LIBS)
-    AC_SUBST(AUDIOFILE_CFLAGS)
-    AC_DEFINE(HAVE_LIBAUDIOFILE,1,[have libaudiofile])
+    PKG_CHECK_MODULES(AUDIOFILE, audiofile >= ${AUDIOFILE_MIN_VER},
+		      ,AUDIOFILE_LIBS="`pkg-config --libs audiofile`"
+		      AUDIOFILE_CFLAGS="`pkg-config --cflags audiofile`"
+		      AC_DEFINE(HAVE_LIBAUDIOFILE, 1, [Have libaudiofile])
+		      ,AC_MSG_ERROR([can not locate libaudiofile]))
 fi
 
+dnl Check for esound
+ESD_MIN_VER="0.2.23"
+
 AC_ARG_WITH(esd,
- [  --with-esd		  Use the Enlightened Sound Daemon
-  --without-esd], [], [with_esd=yes])
+	    [  --with-esd	  Use the Enlightened Sound Daemon
+	     --without-esd], [], [with_esd=yes])
+
 if test "$with_esd" = "yes"; then
-    PKG_CHECK_MODULES(ESD, esound >= 0.2.23)
-    AC_SUBST(ESD_LIBS)
-    AC_SUBST(ESD_CFLAGS)
-    AC_DEFINE(HAVE_ESD,1,[Have esound])
+    PKG_CHECK_MODULES(ESD, esound >= ${ESD_MIN_VER}
+		      ,ESD_LIBS="`pkg-config --libs esound`"
+		      ESD_CFLAGS="`pkg-config --cflags esound`"
+		      AC_DEFINE(HAVE_ESD, 1, [Have ESD])
+		      ,AC_MSG_ERROR([can not locate esound]))
 fi
 
 dnl Check for Doug Lea's malloc in libc
@@ -313,21 +342,31 @@
   CFLAGS="${CFLAGS} -Wall -Wmissing-prototypes -Wno-implicit-int"
 fi
 
+AC_PROG_INSTALL
+
+GETTEXT_PACKAGE=sawfish
+PACKAGE=sawfish
+VERSION=$version
+
+install_sh=../install-sh
+
 AC_MSG_CHECKING(for languages to install)
 AC_ARG_ENABLE(linguas,
-  [  --enable-linguas=LANGS... Install language catalogs for language codes LANGS],
-  [ LINGUAS="$enableval" ], [ LINGUAS="" ])
+	      [  --enable-linguas=LANGS... Install language catalogs for language codes LANGS],
+	      [ LINGUAS="$enableval" ], [ LINGUAS="" ])
+
 if test "x$LINGUAS" = x; then
-  changequote({,})
-  LINGUAS="`echo $srcdir/po/*.po | sed -e 's/[^ ]*\/po\/\([^ ]*\)\.po/\1/g'`"
-  changequote([,])
+	changequote({,})
+	LINGUAS="`echo $srcdir/po/*.po | sed -e 's/[^ ]*\/po\/\([^ ]*\)\.po/\1/g'`"
+	changequote([,])
 fi
+
 dnl too gross for words..
 if test $REP_MSGFMT = true; then
-  LINGUAS=""
+	LINGUAS=""
 fi
+
 AC_MSG_RESULT($LINGUAS)
-AC_SUBST(LINGUAS)
 
 dnl Nonstandard exported symbols
 AC_SUBST(version)
@@ -336,6 +375,7 @@
 AC_SUBST(sawfishexecdir)
 AC_SUBST(lispdir)
 AC_SUBST(localedir)
+AC_SUBST(install_sh)
 AC_SUBST(HAVE_X11)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CFLAGS)
@@ -345,14 +385,106 @@
 AC_SUBST(X_EXTRA_LIBS)
 AC_SUBST(IMLIB_CFLAGS)
 AC_SUBST(IMLIB_LIBS)
+AC_SUBST(XINERAMA_LIBS)
+AC_SUBST(XRANDR_LIBS)
+AC_SUBST(XFT_LIBS)
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(PANGO_MIN_VER)
+AC_SUBST(PANGO_LIBS)
+AC_SUBST(PANGO_CFLAGS)
 AC_SUBST(REP_EXECDIR)
 AC_SUBST(REP_CFLAGS)
 AC_SUBST(REP_LIBS)
 AC_SUBST(REP_VERSION)
 AC_SUBST(REP_MSGFMT)
+AC_SUBST(GDK_PIXBUF_LIBS)
+AC_SUBST(GDK_PIXBUF_CFLAGS)
+AC_SUBST(IMAGE_LIBS)
+AC_SUBST(IMAGE_CFLAGS)
+AC_SUBST(GTK_MIN_VER)
+AC_SUBST(GTK_LIBS)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(REP_MIN_VER)
+AC_SUBST(REP_GTK_MIN_VER)
+AC_SUBST(AUDIOFILE_MIN_VER)
+AC_SUBST(AUDIOFILE_LIBS)
+AC_SUBST(AUDIOFILE_CFLAGS)
+AC_SUBST(ESD_MIN_VER)
+AC_SUBST(ESD_LIBS)
+AC_SUBST(ESD_CFLAGS)
+AC_SUBST(GETTEXT_PACKAGE)
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_SUBST(LINGUAS)
 
 dnl Build all files
-AC_OUTPUT(${output_files})
+AC_CONFIG_FILES([
+Makedefs
+Makefile
+sawfish.spec
+lisp/Makefile
+lisp/sawfish/ui/Makefile
+lisp/sawfish/gtk/Makefile
+lisp/sawfish/gtk/widgets/font.jl
+man/Makefile
+po/Makefile
+scripts/Makefile
+sounds/Makefile
+src/Makefile
+themes/Makefile
+])
+
+AC_OUTPUT
+
+chmod +x build-info
+./build-info
+
+REP_VERSION="`pkg-config --modversion librep`"
+REP_GTK_VERSION="`pkg-config --modversion rep-gtk`"
+GLIB_VERSION="`pkg-config --modversion glib-2.0`"
+CAIRO_VERSION="`pkg-config --modversion cairo`"
+GTK_VERSION="`pkg-config --modversion gtk+-2.0`"
+
+echo "
+  == == == == == == == == == == == == ==
+
+  sawfish:	$version
+
+  == == == == == == == == == == == == ==
+
+  prefix:	$prefix
+  exec_prefix:	$exec_prefix
+  libdir:	$libdir
+  libexecdir:	$libexecdir
+
+  == == == == == == == == == == == == ==
+
+  compiler:	$CC
+  cflags:	$CFLAGS $DEVELOPMENT_CFLAGS
+
+  == == == == == == == == == == == == ==
+
+  rep:		$REP_VERSION
+  rep-gtk:	$REP_GTK_VERSION
+  glib:		$GLIB_VERSION
+  cairo:	$CAIRO_VERSION
+  gtk+:		$GTK_VERSION"
+
+if test "$with_gdk_pixbuf" = "no"; then
+echo "  imlib1:	$IMLIB_VERSION"
+fi
+
+echo "
+  == == == == == == == == == == == == ==
+
+  xserver:	$X_SERVER
+
+  == == == == == == == == == == == == ==
+
+  image loader:	$IMAGE_LOADER
+
+  == == == == == == == == == == == == ==
+  "
 
 dnl If it doesn't look like GNU Make is being used, give a friendly warning
 tem=`make --version -f /dev/null 2>&1 | grep GNU`

Modified: branches/sawfish-1.3/man/news.texi
==============================================================================
--- branches/sawfish-1.3/man/news.texi	(original)
+++ branches/sawfish-1.3/man/news.texi	Wed Apr  1 14:07:19 2009
@@ -16,6 +16,8 @@
 @item make comilation with imlib instead of gdk-pixbuf possible again [Michal Jaegermann]
 
 @item don't ignore datarootdir setting [Christohper Bratusek]
+
+ item new configure.in and build-info from upstream svn [Christopher Bratusek]
 @end itemize
 
 @item Other Changes:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]