sawfish r4433 - trunk

[chrisb svn gnome org]

Author: chrisb
Date: Thu Mar  5 08:21:20 2009
New Revision: 4433
URL: http://svn.gnome.org/viewvc/sawfish?rev=4433&view=rev

Log:
de-intltoolize sawfish


Modified:
   trunk/autogen.sh
   trunk/config.h.in
   trunk/configure.in

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Thu Mar  5 08:21:20 2009
@@ -25,8 +25,6 @@
     else    libtoolize --force --copy --install || exit 1
     fi
   fi
-  echo "Running intltoolize"
-  intltoolize --force || exit 1
   echo "Running aclocal $ACLOCAL_FLAGS"
   aclocal -I m4 $ACLOCAL_FLAGS || exit 1
 

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Thu Mar  5 08:21:20 2009
@@ -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

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Mar  5 08:21:20 2009
@@ -26,8 +26,6 @@
 
 AM_PROG_LIBTOOL
 
-IT_PROG_INTLTOOL([0.40.0])
-
 dnl Release versioning info
 version="1.5.0"
 subversion=""
@@ -350,6 +348,24 @@
 
 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="" ])
+
+if test "x$LINGUAS" = x; then
+	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=""
+fi
+
+AC_MSG_RESULT($LINGUAS)
+
 dnl Nonstandard exported symbols
 AC_SUBST(version)
 AC_SUBST(subversion)
@@ -397,6 +413,7 @@
 AC_SUBST(GETTEXT_PACKAGE)
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
+AC_SUBST(LINGUAS)
 
 dnl Build all files
 AC_CONFIG_FILES([
@@ -410,7 +427,7 @@
 lisp/sawfish/gtk/Makefile
 lisp/sawfish/gtk/widgets/font.jl
 man/Makefile
-po/Makefile.in
+po/Makefile
 scripts/Makefile
 sounds/Makefile
 src/Makefile