[sawfish/sawfish-1.3] make compilation of 1.3 branch work again

[Christopher Bratusek <chrisb src gnome org>]

commit 41c9f7bd3eba2ae89079d2ecb3e3cf03e420daca
Author: chrisb <zanghar freenet de>
Date:   Sun May 3 22:24:15 2009 +0200

    make compilation of 1.3 branch work again
---
 ChangeLog     |    6 ++++++
 Makedefs.in   |    2 +-
 config.h.in   |   17 ++++++++++++++---
 configure.in  |    7 +++----
 man/news.texi |    8 +++++---
 src/images.c  |    2 +-
 6 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 294dfc3..be85c3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-03  Christopher Bratusek <zanghar freenet de>
+	* Makedefs.in
+	* configure
+	* src/images.c: - make compilation of 1.3 branch work again
+			- generate sawfish.pc and sawfish.ebuild
+
 2009-03-18  Christopher Bratusek <zanghar freenet de>
 	* configure.in: taken from 1.5.0 upstream
 
diff --git a/Makedefs.in b/Makedefs.in
index f45a724..cb8bdee 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -54,7 +54,7 @@ LIBS= LIBS@
 #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@
diff --git a/build-info b/build-info
old mode 100644
new mode 100755
diff --git a/config.h.in b/config.h.in
index b546252..d4a601c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,8 @@
 /* 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.
    */
@@ -161,9 +164,17 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
-/* 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 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
diff --git a/configure.in b/configure.in
index d8c9e98..d5edf3a 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ 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_INIT(src/sawfish.h)
 
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_MACRO_DIR([m4])
@@ -432,13 +432,12 @@ scripts/Makefile
 sounds/Makefile
 src/Makefile
 themes/Makefile
+sawfish.pc
+sawfish.ebuild
 ])
 
 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`"
diff --git a/man/news.texi b/man/news.texi
index 79cc51e..f44b367 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -15,7 +15,7 @@ they occurred between. For more detailed information see the
 
 @item make comilation with imlib instead of gdk-pixbuf possible again [Michal Jaegermann]
 
- item don't ignore datarootdir setting [Christohper Bratusek]
+ item don't ignore datarootdir setting [Christopher Bratusek]
 
 @item new configure.in and build-info from upstream svn [Christopher Bratusek]
 @end itemize
@@ -23,9 +23,11 @@ they occurred between. For more detailed information see the
 @item Other Changes:
 @itemize @minus
 
- item don't shipp config.sub/config.guess/install-sh in etc/ subdir [Christohper Bratusek]
+ item don't shipp config.sub/config.guess/install-sh in etc/ subdir [Christopher Bratusek]
 
- item dropped libgnome|gnomeui|gnomecanvas related widgets, use pure-gtk instead [Christohper Bratusek]
+ item dropped libgnome|gnomeui|gnomecanvas related widgets, use pure-gtk instead [Christopher Bratusek]
+
+ item added sawfish.ebuild.in and sawfish.pc from upstream svn [Christopher Bratusek]
 @end itemize
 @end itemize
 
diff --git a/src/images.c b/src/images.c
index 0310b13..e8d90a7 100644
--- a/src/images.c
+++ b/src/images.c
@@ -37,7 +37,7 @@
 # endif
 #endif
 
-#include "sawmill.h"
+#include "sawfish.h"
 #include <assert.h>
 #include <string.h>