GNOME.org
 

sawfish r4349 - in trunk: . man

Author: chrisb
Date: Thu Jan  1 18:12:18 2009
New Revision: 4349
URL: http://svn.gnome.org/viewvc/sawfish?rev=4349&view=rev

Log:
re-apply configure.in rework (fully working now)

update build-info (and actually execute it)


Modified:
   trunk/ChangeLog
   trunk/Makedefs.in
   trunk/autogen.sh
   trunk/build-info
   trunk/config.h.in
   trunk/configure.in
   trunk/man/news.texi

Modified: trunk/Makedefs.in
==============================================================================
--- trunk/Makedefs.in	(original)
+++ trunk/Makedefs.in	Thu Jan  1 18:12:18 2009
@@ -53,7 +53,7 @@
 #LIBOBJS= LIBOBJS@
 LIBOBJS=
 X11_CFLAGS= X_CFLAGS@ @XFT_CFLAGS@
-X11_LIBS= X_PRE_LIBS@ -lX11 @X_LIBS@ @X_EXTRA_LIBS@
+X11_LIBS=-lX11 @X_LIBS@ @X_EXTRA_LIBS@
 EXTRA_X11_LIBS= XINERAMA_LIBS@ @XRANDR_LIBS@ @XFT_LIBS@ -lXext
 IMLIB_CFLAGS= IMLIB_CFLAGS@
 IMLIB_LIBS= IMLIB_LIBS@

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Thu Jan  1 18:12:18 2009
@@ -1,18 +1,24 @@
 #!/bin/sh
 
+if [ -f Makefile ]; then
+	make distclean
+fi
+
+if [ -d m4 ]; then
+	rm -rf m4
+fi
+
 if [ -f configure.in ]; then
-  if grep "AM_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 --force --copy --install || exit 1
   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

Modified: trunk/build-info
==============================================================================
--- trunk/build-info	(original)
+++ trunk/build-info	Thu Jan  1 18:12:18 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: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Thu Jan  1 18:12:18 2009
@@ -1,154 +1,193 @@
-/* config.h.in -- config.h configure input
-   $Id: config.h.in,v 1.16 2005/07/01 16:04:49 jsh Exp $
+/* config.h.in.  Generated from configure.in by autoheader.  */
 
-   Copyright (C) 1999 John Harper <john dcs warwick ac uk>
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
 
-   This file is part of sawmill.
-
-   sawmill is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+/* 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.
+   */
+#undef CRAY_STACKSEG_END
 
-   sawmill is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
-   GNU General Public License for more details.
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
 
-   You should have received a copy of the GNU General Public License
-   along with sawmill; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+/* Doug Lea malloc */
+#undef DOUG_LEA_MALLOC
 
-#ifndef SAWMILL_CONFIG_H
-#define SAWMILL_CONFIG_H
+/* Define to 1 if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
 
-/* Define if X11 is available */
-#undef HAVE_X11
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
 
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
 
-/* Define to empty if the keyword does not work.  */
-#undef const
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+#undef HAVE_DOPRNT
 
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
+/* Have ESD */
+#undef HAVE_ESD
 
-/* Define if words are stored with the most significant byte first */
-#undef WORDS_BIGENDIAN
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
 
-/* 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.  */
-#undef CRAY_STACKSEG_END
+/* Have gdk-pixbuf */
+#undef HAVE_GDK_PIXBUF
 
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
+/* Define to 1 if you have the `gethostname' function. */
+#undef HAVE_GETHOSTNAME
 
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
 
-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
+/* Have GTK */
+#undef HAVE_GTK
 
-/* Define if you have the vprintf function.  */
-#undef HAVE_VPRINTF
+/* Have Imlib1 */
+#undef HAVE_IMLIB
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
+/* Have libaudiofile */
+#undef HAVE_LIBAUDIOFILE
 
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+#undef HAVE_LIBNSL
 
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#undef TIME_WITH_SYS_TIME
+/* Define to 1 if you have the `socket' library (-lsocket). */
+#undef HAVE_LIBSOCKET
 
-/* Define if <memory.h> exists */
+/* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
-#ifdef HAVE_MEMORY_H
-# define NEED_MEMORY_H		/* backwards compatibility */
-#endif
 
-/* Define if <X11/SM/SMlib.h> exists */
-#undef HAVE_X11_SM_SMLIB_H
+/* Have pango */
+#undef HAVE_PANGO
 
-/* Define if <X11/extensions/Xdbe.h> exists */
-#undef HAVE_X11_EXTENSIONS_XDBE_H
+/* Have pangox */
+#undef HAVE_PANGO_X
 
-/* Define if <X11/extensions/Xinerama.h> exists */
-#undef HAVE_X11_EXTENSIONS_XINERAMA_H
+/* Have pangoxft */
+#undef HAVE_PANGO_XFT
 
-/* Define if <X11/extensions/Xrandr.h> exists */
-#undef HAVE_X11_EXTENSIONS_XRANDR_H
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
 
-/* Define if <X11/Xft/Xft.h> exists */
-#undef HAVE_X11_XFT_XFT_H
+/* Define to 1 if you have the `socket' function. */
+#undef HAVE_SOCKET
 
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#undef HAVE_SYS_WAIT_H
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
 
-/* Define if you have the gethostname function.  */
-#undef HAVE_GETHOSTNAME
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
 
-/* Define if you have the snprintf function. */
-#undef HAVE_SNPRINTF
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
 
-/* Define if you have the getpagesize function. */
-#undef HAVE_GETPAGESIZE
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
 
-/* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
 
-/* Define if you have the <sys/time.h> header file.  */
+/* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
-/* Define if you have the <sys/utsname.h> header file.  */
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/utsname.h> header file. */
 #undef HAVE_SYS_UTSNAME_H
 
-/* Define if you have the <unistd.h> header file.  */
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define if you have the nsl library (-lnsl).  */
-#undef HAVE_LIBNSL
+/* Define to 1 if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
 
-/* Define if you have the og library (-log).  */
-#undef HAVE_LIBOG
+/* Have X11 */
+#undef HAVE_X11
 
-/* Define if you have the socket library (-lsocket).  */
-#undef HAVE_LIBSOCKET
+/* Define to 1 if you have the <X11/extensions/Xdbe.h> header file. */
+#undef HAVE_X11_EXTENSIONS_XDBE_H
 
-/* Define if using Doug Lea's malloc */
-#undef DOUG_LEA_MALLOC
+/* Have xinerama */
+#undef HAVE_X11_EXTENSIONS_XINERAMA_H
 
-/* Define if using libc's malloc */
-#undef LIBC_MALLOC
+/* Have xrandr */
+#undef HAVE_X11_EXTENSIONS_XRANDR_H
 
-/* Define if using r_alloc and friends */
-#undef USE_R_ALLOC
+/* Have xft */
+#undef HAVE_X11_XFT_XFT_H
 
-/* Define if you have the enlightened sound daemon */
-#undef HAVE_ESD
+/* libc malloc */
+#undef LIBC_MALLOC
 
-/* Define if using Imlib 1 */
-#undef HAVE_IMLIB
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
 
-/* Define if using pixmap-cache.c */
+/* Need pixmap cache */
 #undef NEED_PIXMAP_CACHE
 
-/* Define if you have gdk-pixbuf (the xlib version) */
-#undef HAVE_GDK_PIXBUF
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
 
-/* Define if you have pango */
-#undef HAVE_PANGO
-#undef HAVE_PANGO_X
-#undef HAVE_PANGO_XFT
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
 
-#endif /* SAWMILL_CONFIG_H */
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* 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
+
+/* Have x11 */
+#undef X_DISPLAY_MISSING
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jan  1 18:12:18 2009
@@ -2,53 +2,39 @@
 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/sawfish.h)
+
 AC_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_PROG_LIBTOOL
 
 dnl Release versioning info
 version="1.5.0"
 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 sawfish.pc sawfish.ebuild"
-
 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
-
 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/'`
@@ -60,36 +46,20 @@
 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)
 
 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_CHECK_HEADERS(X11/extensions/Xdbe.h, [], [], [#include <X11/Xlib.h> ])
 
 dnl Checks for X extensions/libraries
 XINERAMA_LIBS=""
@@ -97,151 +67,155 @@
 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't 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't 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't locate libXft]))
 
-AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
-	     [XINERAMA_LIBS="-lXinerama"
-	      AC_CHECK_HEADERS(X11/extensions/Xinerama.h)],
-	     [],[$X_LIBS -lX11 -lXext])
-
-AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
-	     [XRANDR_LIBS="-lXrandr"
-	      AC_CHECK_HEADERS(X11/extensions/Xrandr.h, [], [], 
-	         [#include <X11/Xlib.h> ])],
-	     [],[$X_LIBS -lX11 -lXext])
-
-dnl Try using pkg-config first, since it looks like Xft2 may fail our
-dnl hand-crafted tests
-PKG_CHECK_MODULES(XFT, xft >= 1.0,
- [_cppflags=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
-  AC_CHECK_HEADERS(X11/Xft/Xft.h)
-  CPPFLAGS=$_cppflags],
- [AC_CHECK_LIB(Xft, XftDrawCreate,
-	       [XFT_LIBS="-lXft -lXrender"
-	       AC_CHECK_HEADERS(X11/Xft/Xft.h)],
-	       [], [$X_LIBS -lX11 -lXext])])
+dnl Checks for pango
+PANGO_MIN_VER="1.8.0"
 
-CPPFLAGS="${_cppflags}"
+PANGO_MODULES="pango "
 
-dnl Checks for pango
-PKG_CHECK_MODULES(PANGO, pango >= 1.8.0,
-  [if $PKG_CONFIG --exists pangoxft; then
-     AC_DEFINE(HAVE_PANGO_XFT, 1, [Have pangoxft])
-     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, [Have pango])
-     AC_DEFINE(HAVE_PANGO_X, 1, [Have pango x])
-     PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_MODULES`
-     PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_MODULES`
-   fi], [: nothing])
+PKG_CHECK_MODULES(PANGO, pango >= ${PANGO_MIN_VER}
+		  ,AC_DEFINE(HAVE_PANGO, 1, [Have pango])
+		  ,AC_MSG_ERROR([can't locate pango]))
+
+PKG_CHECK_MODULES(PANGOX, pangox >= ${PANGO_MIN_VER}
+		  ,AC_DEFINE(HAVE_PANGO_X, 1, [Have pangox]) 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+="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
-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`"
+REP_MIN_VER="0.17.3"
 
-AC_SUBST(REP_EXECDIR)
-AC_SUBST(REP_CFLAGS)
-AC_SUBST(REP_LIBS)
-AC_SUBST(REP_MSGFMT)
+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't locate librep])) 
 
 dnl Check for rep-gtk
-PKG_CHECK_MODULES(REP_GTK, rep-gtk >= 0.18.4)
+REP_GTK_MIN_VER="0.18.4"
+
+PKG_CHECK_MODULES(REP_GTK, rep-gtk >= 0.18.4
+		  ,
+		  ,AC_MSG_ERROR([can't 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
+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't locate libX11]))
+
+X_LIBS+=" -lXext -lXrender"
+
+X_EXTRA_LIBS=""
+
+PKG_CHECK_MODULES(libICE, ice >= 1.0
+		  ,X_EXTRA_LIBS+="-lICE "
+		  ,AC_MSG_ERROR([can't locate libICE]))
+
+PKG_CHECK_MODULES(libSM, sm >= 1.0
+		  ,X_EXTRA_LIBS+="-lSM "
+		  ,AC_MSG_ERROR([can't locate libSM]))
+
+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't 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,[Have gdk-pixbuf])
-    AC_DEFINE(NEED_PIXMAP_CACHE,1,[Neex 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}'
+			  with_gdk_pixbuf=yes
+			  ,AC_MSG_ERROR([can't 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}'
+			  ,AC_MSG_ERROR([can't 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't 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 ESD])
+    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't locate esound]))
 fi
 
+dnl XXX Deprecated
+dnl Check for libgnome|gnomeui|gnomecanvas
+
 AC_ARG_ENABLE(gnome-widgets,
- [  --enable-gnome-widgets  Use GNOME widgets in places [default]
-  --disable-gnome-widgets Don't use GNOME widgets], [],
- [enable_gnome_widgets=no])
+	      [  --enable-gnome-widgets  Use GNOME widgets in places [default]
+	      --disable-gnome-widgets Don't use GNOME widgets], [], [enable_gnome_widgets=no])
 
 if test "$enable_gnome_widgets" != "no"; then
   AC_MSG_CHECKING([for rep-gtk GNOME wrappers])
@@ -341,6 +315,8 @@
 AC_MSG_RESULT($LINGUAS)
 AC_SUBST(LINGUAS)
 
+AC_PROG_INSTALL
+
 dnl Nonstandard exported symbols
 AC_SUBST(version)
 AC_SUBST(subversion)
@@ -357,12 +333,59 @@
 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)
 
 dnl Build all files
-AC_OUTPUT(${output_files})
+AC_CONFIG_FILES([
+Makedefs
+Makefile
+sawfish.ebuild
+sawfish.pc
+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
 
 mv sawfish.ebuild sawfish-$version.ebuild
 
+./build-info
+
 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`
 if test "x$tem" = "x"; then

Modified: trunk/man/news.texi
==============================================================================
--- trunk/man/news.texi	(original)
+++ trunk/man/news.texi	Thu Jan  1 18:12:18 2009
@@ -20,6 +20,12 @@
 @item rep-gtk 0.18.3 -> 0.18.4
 @end itemize
 
+ item Bugs fixed:
+ itemize @minus
+
+ item Create src/build.h, since it has been missing before [Christopher Bratusek]
+ end itemize
+
 @item New features:
 @itemize @minus
 
@@ -61,8 +67,6 @@
 @item sawmill-defaults is now sawfish-defaults [Christopher Bratusek]
 
 @item ~/.sawmillrc has been dropped from the list of configuration files [Christopher Bratusek]
-
- item Reworked Sawfish-UI [Christopher Bratusek]
 @end itemize
 @end itemize
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]