Updated i18n stuff (libxfce4util now provides a i18n.h).

updated X11.m4
updated xfwm4 to compile well with -Werror -Wall
updated xfce-mcs-plugins and added a hint to the README for XFree86 users


(Old svn revision: 11031)

1 files changed, 16 insertions, 33 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 62edc3b12..756ed3561 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -848,33 +848,6 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 
 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
-# isc-posix.m4 serial 2 (gettext-0.11.2)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
-
 
 # serial 46 AC_PROG_LIBTOOL
 AC_DEFUN([AC_PROG_LIBTOOL],
@@ -1918,8 +1891,6 @@ glib_DEFUN([GLIB_WITH_NLS],
 	    [CATOBJEXT=.mo
              DATADIRNAME=lib])
 	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
 	fi
       fi
     ])
@@ -2213,6 +2184,18 @@ AC_HELP_STRING([--disable-rpath], [Do not use -rpath (use with care!!)]),
   fi
 ])
 
+AC_DEFUN([BM_PKG_LDFLAGS], [
+  AC_REQUIRE([BM_RPATH_SUPPORT])
+  AC_MSG_CHECKING([which pkg-config LDFLAGS to use])
+  if test "x$LD_RPATH" == "x"; then
+    $1_LDFLAGS="-L\${libdir}"
+  else
+    $1_LDFLAGS="$LD_RPATH\${libdir} -L\${libdir}"
+  fi
+  AC_MSG_RESULT([$$1_LDFLAGS])
+  AC_SUBST($1_LDFLAGS)
+])
+
 dnl From Benedikt Meurer (benedikt.meurer@unix-ag.uni-siegen.de)
 dnl
 dnl
@@ -2313,13 +2296,13 @@ AC_HELP_STRING([--enable-debug[=yes|no|full]], [Build with debugging support])
 AC_HELP_STRING([--disable-debug], [Include no debugging support [default]]),
     [ac_cv_debug=$enableval], [ac_cv_debug=no])
   AC_MSG_CHECKING([whether to build with debugging support])
-  if test "x$ac_cv_debug" != "xno"; then
+  if test x$ac_cv_debug != xno; then
     AC_DEFINE(DEBUG, 1, Define for debugging support)
-    if test "x$ac_cv_debug" == "xfull"; then
-      CFLAGS="$CFLAGS -g3 -Wall -Werror"
+    if test x$ac_cv_debug == xfull; then
+      CFLAGS="$CFLAGS -g3 -Wall -Werror -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
       AC_MSG_RESULT([full])
     else
-      CFLAGS="$CFLAGS -g -Wall -Werror"
+      CFLAGS="$CFLAGS -g -Wall -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
       AC_MSG_RESULT([yes])
     fi
   else