r17737 - in /desktop/experimental/bug-buddy/debian: changelog patches/02_disable_breakpad.patch patches/60_detect-and-link-x11.patch patches/70_automake-autoconf.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Nov 26 10:45:29 UTC 2008
Author: joss
Date: Wed Nov 26 10:45:29 2008
New Revision: 17737
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17737
Log:
* 02_disable_breakpad.patch: integrated again, it was *not* merged
upstream.
* 60_detect-and-link-x11.patch: refreshed.
* 70_automake-autoconf.patch: regenerated.
Added:
desktop/experimental/bug-buddy/debian/patches/02_disable_breakpad.patch
Modified:
desktop/experimental/bug-buddy/debian/changelog
desktop/experimental/bug-buddy/debian/patches/60_detect-and-link-x11.patch
desktop/experimental/bug-buddy/debian/patches/70_automake-autoconf.patch
desktop/experimental/bug-buddy/debian/patches/series
Modified: desktop/experimental/bug-buddy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/bug-buddy/debian/changelog?rev=17737&op=diff
==============================================================================
--- desktop/experimental/bug-buddy/debian/changelog (original)
+++ desktop/experimental/bug-buddy/debian/changelog Wed Nov 26 10:45:29 2008
@@ -1,8 +1,12 @@
-bug-buddy (2.24.1+dfsg-2) UNRELEASED; urgency=low
+bug-buddy (2.24.1+dfsg-2) experimental; urgency=low
* Fix watch file.
-
- -- Josselin Mouette <joss at debian.org> Mon, 17 Nov 2008 12:59:51 +0100
+ * 02_disable_breakpad.patch: integrated again, it was *not* merged
+ upstream.
+ * 60_detect-and-link-x11.patch: refreshed.
+ * 70_automake-autoconf.patch: regenerated.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 26 Nov 2008 11:45:42 +0100
bug-buddy (2.24.1+dfsg-1) experimental; urgency=low
Added: desktop/experimental/bug-buddy/debian/patches/02_disable_breakpad.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/bug-buddy/debian/patches/02_disable_breakpad.patch?rev=17737&op=file
==============================================================================
--- desktop/experimental/bug-buddy/debian/patches/02_disable_breakpad.patch (added)
+++ desktop/experimental/bug-buddy/debian/patches/02_disable_breakpad.patch Wed Nov 26 10:45:29 2008
@@ -1,0 +1,34 @@
+Index: bug-buddy-2.24.1/configure.in
+===================================================================
+--- bug-buddy-2.24.1.orig/configure.in 2008-10-19 12:42:03.000000000 +0200
++++ bug-buddy-2.24.1/configure.in 2008-11-26 10:28:58.907860565 +0100
+@@ -87,7 +87,11 @@ AC_CHECK_LIB(elf, elf_version)
+ AC_CHECK_HEADERS([libelf.h],[],[AC_MSG_ERROR([libelf.h not found.])])
+ AC_CHECK_HEADERS([gelf.h],[],[AC_MSG_ERROR([gelf.h not found.])])
+
+-AC_CONFIG_SUBDIRS(google-breakpad)
++AC_ARG_ENABLE(google-breakpad,
++ AC_HELP_STRING([--disable-google-breakpad],
++ [compile without google breakpad]),
++ enable_google_breakpad=$enableval, enable_google_breakpad=yes)
++
+ GOOGLE_BREAKPAD_SUPPORTED_OS="no"
+ case $target_os in
+ ##################################################
+@@ -111,12 +115,15 @@ case $target_cpu in
+ GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
+ esac
+
+-if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
++if test x$enable_google_breakpad = xyes; then
++ if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
+ if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
+ echo "OS and CPU supported: enabling google-breakpad"
+ AC_DEFINE(ENABLE_GOOGLE_BREAKPAD, 1, [define if google-break is enabled])
++ AC_CONFIG_SUBDIRS(google-breakpad)
+ use_google_breakpad=yes
+ fi
++ fi
+ fi
+
+ AM_CONDITIONAL(USE_GOOGLE_BREAKPAD, test x$use_google_breakpad = xyes)
Modified: desktop/experimental/bug-buddy/debian/patches/60_detect-and-link-x11.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/bug-buddy/debian/patches/60_detect-and-link-x11.patch?rev=17737&op=diff
==============================================================================
--- desktop/experimental/bug-buddy/debian/patches/60_detect-and-link-x11.patch (original)
+++ desktop/experimental/bug-buddy/debian/patches/60_detect-and-link-x11.patch Wed Nov 26 10:45:29 2008
@@ -1,12 +1,12 @@
GNOME #500179; Debian #453178; fixes missing link flags for libX11 (FTBFS)
-Index: bug-buddy-2.22.0/configure.in
+Index: bug-buddy-2.24.1/configure.in
===================================================================
---- bug-buddy-2.22.0.orig/configure.in 2008-04-26 15:48:22.454968169 +0200
-+++ bug-buddy-2.22.0/configure.in 2008-04-26 15:48:24.554971793 +0200
-@@ -151,6 +151,29 @@ then
- AC_DEFINE(HAVE_NETWORKMANAGER, 1, [define if NetworkManager is installed])
- fi
+--- bug-buddy-2.24.1.orig/configure.in 2008-11-26 10:28:58.907860565 +0100
++++ bug-buddy-2.24.1/configure.in 2008-11-26 10:29:23.391363497 +0100
+@@ -143,6 +143,29 @@ PKG_CHECK_MODULES(GNOME_CRASH, $LIBGNOME
+ AC_SUBST(GNOME_CRASH_CFLAGS)
+ AC_SUBST(GNOME_CRASH_LIBS)
+# check for X11 for XUngrabServer
+PKG_CHECK_MODULES(X, x11, :, [
@@ -34,10 +34,10 @@
GETTEXT_PACKAGE=bug-buddy
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
-Index: bug-buddy-2.22.0/gnome-breakpad/Makefile.am
+Index: bug-buddy-2.24.1/gnome-breakpad/Makefile.am
===================================================================
---- bug-buddy-2.22.0.orig/gnome-breakpad/Makefile.am 2007-10-13 16:42:42.000000000 +0200
-+++ bug-buddy-2.22.0/gnome-breakpad/Makefile.am 2008-04-26 15:48:24.554971793 +0200
+--- bug-buddy-2.24.1.orig/gnome-breakpad/Makefile.am 2008-09-11 11:31:21.000000000 +0200
++++ bug-buddy-2.24.1/gnome-breakpad/Makefile.am 2008-11-26 10:29:23.391363497 +0100
@@ -37,5 +37,5 @@ module_LTLIBRARIES = libgnomebreakpad.la
moduledir = $(libdir)/gtk-2.0/modules
Modified: desktop/experimental/bug-buddy/debian/patches/70_automake-autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/bug-buddy/debian/patches/70_automake-autoconf.patch?rev=17737&op=diff
==============================================================================
--- desktop/experimental/bug-buddy/debian/patches/70_automake-autoconf.patch (original)
+++ desktop/experimental/bug-buddy/debian/patches/70_automake-autoconf.patch Wed Nov 26 10:45:29 2008
@@ -7,7 +7,7 @@
Index: bug-buddy-2.24.1/aclocal.m4
===================================================================
--- bug-buddy-2.24.1.orig/aclocal.m4 2008-10-19 12:42:29.000000000 +0200
-+++ bug-buddy-2.24.1/aclocal.m4 2008-11-13 16:38:58.866990358 +0100
++++ bug-buddy-2.24.1/aclocal.m4 2008-11-26 10:29:45.567862536 +0100
@@ -686,6 +686,6658 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
AC_SUBST(WARN_CXXFLAGS)
])
@@ -6670,7 +6670,7 @@
Index: bug-buddy-2.24.1/bugzilla/gnome/Makefile.in
===================================================================
--- bug-buddy-2.24.1.orig/bugzilla/gnome/Makefile.in 2008-10-19 12:42:34.000000000 +0200
-+++ bug-buddy-2.24.1/bugzilla/gnome/Makefile.in 2008-11-13 16:41:17.598984507 +0100
++++ bug-buddy-2.24.1/bugzilla/gnome/Makefile.in 2008-11-26 10:30:11.895357790 +0100
@@ -184,6 +184,11 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
@@ -6686,7 +6686,7 @@
Index: bug-buddy-2.24.1/bugzilla/Makefile.in
===================================================================
--- bug-buddy-2.24.1.orig/bugzilla/Makefile.in 2008-10-19 12:42:34.000000000 +0200
-+++ bug-buddy-2.24.1/bugzilla/Makefile.in 2008-11-13 16:41:17.526986320 +0100
++++ bug-buddy-2.24.1/bugzilla/Makefile.in 2008-11-26 10:30:11.819358535 +0100
@@ -196,6 +196,11 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
@@ -6702,7 +6702,7 @@
Index: bug-buddy-2.24.1/bugzilla/ximian/Makefile.in
===================================================================
--- bug-buddy-2.24.1.orig/bugzilla/ximian/Makefile.in 2008-10-19 12:42:34.000000000 +0200
-+++ bug-buddy-2.24.1/bugzilla/ximian/Makefile.in 2008-11-13 16:41:17.674986206 +0100
++++ bug-buddy-2.24.1/bugzilla/ximian/Makefile.in 2008-11-26 10:30:11.975358111 +0100
@@ -184,6 +184,11 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
@@ -6718,7 +6718,7 @@
Index: bug-buddy-2.24.1/configure
===================================================================
--- bug-buddy-2.24.1.orig/configure 2008-10-19 12:42:32.000000000 +0200
-+++ bug-buddy-2.24.1/configure 2008-11-13 16:41:16.382986665 +0100
++++ bug-buddy-2.24.1/configure 2008-11-26 10:30:13.603357829 +0100
@@ -940,6 +940,11 @@ GNOME_BREAKPAD_CFLAGS
GNOME_BREAKPAD_LIBS
GNOME_CRASH_CFLAGS
@@ -6754,7 +6754,16 @@
System types:
--build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD]
-@@ -1593,6 +1605,7 @@ Optional Packages:
+@@ -1575,6 +1587,8 @@ Optional Features:
+ --disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-eds Enable support for getting user email from eds
+ [default=yes]
++ --disable-google-breakpad
++ compile without google breakpad
+ --enable-compile-warnings=[no/minimum/yes/maximum/error]
+ Turn on compiler warnings
+ --enable-iso-c Try to warn if code is not ISO C
+@@ -1593,6 +1607,7 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -6762,7 +6771,7 @@
Some influential environment variables:
PKG_CONFIG path to pkg-config utility
-@@ -1623,6 +1636,9 @@ Some influential environment variables:
+@@ -1623,6 +1638,9 @@ Some influential environment variables:
C compiler flags for GNOME_CRASH, overriding pkg-config
GNOME_CRASH_LIBS
linker flags for GNOME_CRASH, overriding pkg-config
@@ -6772,149 +6781,186 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-@@ -7264,13 +7280,13 @@ if test "${lt_cv_nm_interface+set}" = se
+@@ -7264,13 +7282,13 @@ if test "${lt_cv_nm_interface+set}" = se
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7267: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:7283: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:7285: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7270: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:7286: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:7288: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7273: output\"" >&5)
-+ (eval echo "\"\$as_me:7289: output\"" >&5)
++ (eval echo "\"\$as_me:7291: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -8380,7 +8396,7 @@ ia64-*-hpux*)
+@@ -8380,7 +8398,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8383 "configure"' > conftest.$ac_ext
-+ echo '#line 8399 "configure"' > conftest.$ac_ext
++ echo '#line 8401 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -10501,11 +10517,11 @@ else
+@@ -10501,11 +10519,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10504: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10520: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10522: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10508: \$? = $ac_status" >&5
-+ echo "$as_me:10524: \$? = $ac_status" >&5
++ echo "$as_me:10526: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -10825,11 +10841,11 @@ else
+@@ -10825,11 +10843,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10828: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10844: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10846: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10832: \$? = $ac_status" >&5
-+ echo "$as_me:10848: \$? = $ac_status" >&5
++ echo "$as_me:10850: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -10930,11 +10946,11 @@ else
+@@ -10930,11 +10948,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10933: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10949: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10951: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10937: \$? = $ac_status" >&5
-+ echo "$as_me:10953: \$? = $ac_status" >&5
++ echo "$as_me:10955: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10985,11 +11001,11 @@ else
+@@ -10985,11 +11003,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10988: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11004: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11006: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10992: \$? = $ac_status" >&5
-+ echo "$as_me:11008: \$? = $ac_status" >&5
++ echo "$as_me:11010: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13746,7 +13762,7 @@ else
+@@ -13746,7 +13764,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13749 "configure"
-+#line 13765 "configure"
++#line 13767 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13846,7 +13862,7 @@ else
+@@ -13846,7 +13864,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13849 "configure"
-+#line 13865 "configure"
++#line 13867 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15849,11 +15865,11 @@ else
+@@ -15849,11 +15867,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15852: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15868: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15870: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15856: \$? = $ac_status" >&5
-+ echo "$as_me:15872: \$? = $ac_status" >&5
++ echo "$as_me:15874: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -15948,11 +15964,11 @@ else
+@@ -15948,11 +15966,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15951: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15967: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15969: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15955: \$? = $ac_status" >&5
-+ echo "$as_me:15971: \$? = $ac_status" >&5
++ echo "$as_me:15973: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16000,11 +16016,11 @@ else
+@@ -16000,11 +16018,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16003: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16019: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16021: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16007: \$? = $ac_status" >&5
-+ echo "$as_me:16023: \$? = $ac_status" >&5
++ echo "$as_me:16025: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18069,176 +18085,344 @@ fi
+@@ -17757,7 +17775,13 @@ fi
+ done
+
+
+-subdirs="$subdirs google-breakpad"
++# Check whether --enable-google-breakpad was given.
++if test "${enable_google_breakpad+set}" = set; then
++ enableval=$enable_google_breakpad; enable_google_breakpad=$enableval
++else
++ enable_google_breakpad=yes
++fi
++
+
+ GOOGLE_BREAKPAD_SUPPORTED_OS="no"
+ case $target_os in
+@@ -17782,7 +17806,8 @@ case $target_cpu in
+ GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
+ esac
+
+-if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
++if test x$enable_google_breakpad = xyes; then
++ if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
+ if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
+ echo "OS and CPU supported: enabling google-breakpad"
+
+@@ -17790,8 +17815,11 @@ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_GOOGLE_BREAKPAD 1
+ _ACEOF
+
++ subdirs="$subdirs google-breakpad"
++
+ use_google_breakpad=yes
+ fi
++ fi
+ fi
+
+ if test x$use_google_breakpad = xyes; then
+@@ -18069,79 +18097,116 @@ fi
@@ -6924,15 +6970,11 @@
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-_ACEOF
-
+-
+# check for X11 for XUngrabServer
+{ echo "$as_me:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-
-+# Check whether --with-x was given.
-+if test "${with_x+set}" = set; then
-+ withval=$with_x;
-+fi
-for ac_header in locale.h
-do
@@ -6941,26 +6983,61 @@
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++# Check whether --with-x was given.
++if test "${with_x+set}" = set; then
++ withval=$with_x;
+ fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
++
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+ # The user explicitly disabled X.
+ have_x=disabled
-+else
+ else
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+ case $x_includes,$x_libraries in #(
+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
+echo "$as_me: error: Cannot use X directory names containing '" >&2;}
+ { (exit 1); exit 1; }; };; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
++ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+ # One or both of the vars are not set, and there is no cached value.
+ac_x_includes=no ac_x_libraries=no
+rm -f -r conftest.dir
@@ -7000,8 +7077,16 @@
+ fi
+ cd ..
+ rm -f -r conftest.dir
-+fi
-+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+# Standard set of common directories for X headers.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ac_x_header_dirs='
@@ -7048,40 +7133,23 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
--$ac_includes_default
-#include <$ac_header>
+#include <X11/Xlib.h>
_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+@@ -18159,86 +18224,40 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_header_compiler=yes
-+ }; then
+ }; then
+- ac_header_preproc=yes
+ # We can compile using X headers with no special include directory.
+ac_x_includes=
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-- ac_header_compiler=no
+- ac_header_preproc=no
+ for ac_dir in $ac_x_header_dirs; do
+ if test -r "$ac_dir/X11/Xlib.h"; then
+ ac_x_includes=$ac_dir
@@ -7090,90 +7158,10 @@
+done
fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+rm -f conftest.err conftest.$ac_ext
-+fi # $ac_x_includes = no
-
--# Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
-+if test "$ac_x_libraries" = no; then
-+ # Check for the libraries.
-+ # See if we find them without any special options.
-+ # Don't add to $LIBS permanently.
-+ ac_save_LIBS=$LIBS
-+ LIBS="-lX11 $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <$ac_header>
-+#include <X11/Xlib.h>
-+int
-+main ()
-+{
-+XrmInitialize ()
-+ ;
-+ return 0;
-+}
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
-- }; then
-- ac_header_preproc=yes
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ LIBS=$ac_save_LIBS
-+# We can link X programs with no special library path.
-+ac_x_libraries=
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_header_preproc=no
-+ LIBS=$ac_save_LIBS
-+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-+do
-+ # Don't even attempt the hair of trying to link an X program!
-+ for ac_extension in a so sl; do
-+ if test -r "$ac_dir/libX11.$ac_extension"; then
-+ ac_x_libraries=$ac_dir
-+ break 2
-+ fi
-+ done
-+done
- fi
-
--rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi # $ac_x_libraries = no
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -7203,6 +7191,87 @@
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
++fi # $ac_x_includes = no
+
+- if test $ac_cv_header_locale_h = yes; then
+- { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
+-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++if test "$ac_x_libraries" = no; then
++ # Check for the libraries.
++ # See if we find them without any special options.
++ # Don't add to $LIBS permanently.
++ ac_save_LIBS=$LIBS
++ LIBS="-lX11 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <locale.h>
++#include <X11/Xlib.h>
+ int
+ main ()
+ {
+-return LC_MESSAGES
++XrmInitialize ()
+ ;
+ return 0;
+ }
+@@ -18261,65 +18280,173 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+- am_cv_val_LC_MESSAGES=yes
++ LIBS=$ac_save_LIBS
++# We can link X programs with no special library path.
++ac_x_libraries=
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- am_cv_val_LC_MESSAGES=no
++ LIBS=$ac_save_LIBS
++for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
++do
++ # Don't even attempt the hair of trying to link an X program!
++ for ac_extension in a so sl; do
++ if test -r "$ac_dir/libX11.$ac_extension"; then
++ ac_x_libraries=$ac_dir
++ break 2
++ fi
++ done
++done
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
++fi # $ac_x_libraries = no
++
+case $ac_x_includes,$ac_x_libraries in #(
+ no,* | *,no | *\'*)
+ # Didn't find X, or a directory has "'" in its name.
@@ -7212,23 +7281,20 @@
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$ac_x_includes'\
+ ac_x_libraries='$ac_x_libraries'"
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- eval "$as_ac_Header=\$ac_header_preproc"
++esac
fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
+-{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
+- if test $am_cv_val_LC_MESSAGES = yes; then
+;; #(
+ *) have_x=yes;;
+ esac
+ eval "$ac_cv_have_x"
+fi # $with_x != no
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LC_MESSAGES 1
+-_ACEOF
+if test "$have_x" != yes; then
+ { echo "$as_me:$LINENO: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6; }
@@ -7243,17 +7309,13 @@
+ ac_x_libraries='$x_libraries'"
+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-
++fi
++
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-+
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$X_CFLAGS"; then
+ pkg_cv_X_CFLAGS="$X_CFLAGS"
@@ -7268,7 +7330,9 @@
+else
+ pkg_failed=yes
+fi
-+ fi
+ fi
+- fi
+- USE_NLS=yes
+else
+ pkg_failed=untried
+fi
@@ -7290,16 +7354,27 @@
+else
+ pkg_failed=untried
+fi
-+
-+
-+
+
+
+- gt_cv_have_gettext=no
+
+- CATOBJEXT=NONE
+- XGETTEXT=:
+- INTLLIBS=
+if test $pkg_failed = yes; then
-+
+
+- if test "${ac_cv_header_libintl_h+set}" = set; then
+- { echo "$as_me:$LINENO: checking for libintl.h" >&5
+-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+-if test "${ac_cv_header_libintl_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+ if test $_pkg_short_errors_supported = yes; then
+ X_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
+ else
@@ -7307,16 +7382,10 @@
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$X_PKG_ERRORS" >&5
-
--done
++
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
-
-- if test $ac_cv_header_locale_h = yes; then
-- { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
--echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
--if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
++
+ # pkg-config modules not found (only present since X11R7 aka Xorg); use
+ # old-style detection
+ if test "$no_x" = yes; then
@@ -7328,7 +7397,10 @@
+
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-- cat >conftest.$ac_ext <<_ACEOF
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
+-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+ if test -n "$x_includes"; then
+ X_CFLAGS="$X_CFLAGS -I$x_includes"
+ fi
@@ -7344,73 +7416,6 @@
+ ac_xsave_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <locale.h>
-+
- int
- main ()
- {
--return LC_MESSAGES
-+
- ;
- return 0;
- }
-@@ -18261,65 +18445,37 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-- am_cv_val_LC_MESSAGES=yes
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ X_LIBS="$X_LIBS -R$x_libraries"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- am_cv_val_LC_MESSAGES=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
--echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
-- if test $am_cv_val_LC_MESSAGES = yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LC_MESSAGES 1
--_ACEOF
--
-- fi
-- fi
-- USE_NLS=yes
--
--
-- gt_cv_have_gettext=no
--
-- CATOBJEXT=NONE
-- XGETTEXT=:
-- INTLLIBS=
--
-- if test "${ac_cv_header_libintl_h+set}" = set; then
-- { echo "$as_me:$LINENO: checking for libintl.h" >&5
--echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
--if test "${ac_cv_header_libintl_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
--echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
--else
-- # Is the header compilable?
--{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
--echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
-+ LIBS="$ac_xsave_LIBS -R $x_libraries"
-+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -7441,12 +7446,57 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -18328,8 +18484,2518 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -18328,17 +18455,2568 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ X_LIBS="$X_LIBS -R$x_libraries"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_header_compiler=no
+-fi
++ LIBS="$ac_xsave_LIBS -R $x_libraries"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
@@ -9959,10 +10009,19 @@
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -21098,6 +23764,11 @@ GNOME_BREAKPAD_CFLAGS!$GNOME_BREAKPAD_CF
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_compiler=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+@@ -21098,6 +23776,11 @@ GNOME_BREAKPAD_CFLAGS!$GNOME_BREAKPAD_CF
GNOME_BREAKPAD_LIBS!$GNOME_BREAKPAD_LIBS$ac_delim
GNOME_CRASH_CFLAGS!$GNOME_CRASH_CFLAGS$ac_delim
GNOME_CRASH_LIBS!$GNOME_CRASH_LIBS$ac_delim
@@ -9974,7 +10033,7 @@
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
CATALOGS!$CATALOGS$ac_delim
-@@ -21110,11 +23781,6 @@ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE
+@@ -21110,11 +23793,6 @@ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
@@ -9986,7 +10045,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -21156,10 +23822,15 @@ _ACEOF
+@@ -21156,10 +23834,15 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -10006,7 +10065,7 @@
Index: bug-buddy-2.24.1/data/icons/Makefile.in
===================================================================
--- bug-buddy-2.24.1.orig/data/icons/Makefile.in 2008-10-19 12:42:34.000000000 +0200
-+++ bug-buddy-2.24.1/data/icons/Makefile.in 2008-11-13 16:41:17.850985251 +0100
++++ bug-buddy-2.24.1/data/icons/Makefile.in 2008-11-26 10:30:12.151358622 +0100
@@ -176,6 +176,11 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
@@ -10022,7 +10081,7 @@
Index: bug-buddy-2.24.1/data/Makefile.in
===================================================================
--- bug-buddy-2.24.1.orig/data/Makefile.in 2008-10-19 12:42:34.000000000 +0200
-+++ bug-buddy-2.24.1/data/Makefile.in 2008-11-13 16:41:17.770985908 +0100
++++ bug-buddy-2.24.1/data/Makefile.in 2008-11-26 10:30:12.071358301 +0100
@@ -203,6 +203,11 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
@@ -10038,7 +10097,7 @@
Index: bug-buddy-2.24.1/docs/Makefile.in
===================================================================
--- bug-buddy-2.24.1.orig/docs/Makefile.in 2008-10-19 12:42:34.000000000 +0200
-+++ bug-buddy-2.24.1/docs/Makefile.in 2008-11-13 16:41:17.930986061 +0100
++++ bug-buddy-2.24.1/docs/Makefile.in 2008-11-26 10:30:12.231357966 +0100
@@ -178,6 +178,11 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
@@ -10054,7 +10113,7 @@
Index: bug-buddy-2.24.1/gnome-breakpad/Makefile.in
===================================================================
--- bug-buddy-2.24.1.orig/gnome-breakpad/Makefile.in 2008-10-19 12:42:34.000000000 +0200
-+++ bug-buddy-2.24.1/gnome-breakpad/Makefile.in 2008-11-13 16:41:18.086985637 +0100
++++ bug-buddy-2.24.1/gnome-breakpad/Makefile.in 2008-11-26 10:30:12.419358257 +0100
@@ -58,7 +58,7 @@ LTLIBRARIES = $(module_LTLIBRARIES)
@USE_GOOGLE_BREAKPAD_TRUE at am__DEPENDENCIES_1 = $(top_builddir)/google-breakpad/src/libbreakpad.la
am__DEPENDENCIES_2 =
@@ -10088,7 +10147,7 @@
Index: bug-buddy-2.24.1/ltmain.sh
===================================================================
--- bug-buddy-2.24.1.orig/ltmain.sh 2008-10-19 12:42:21.000000000 +0200
-+++ bug-buddy-2.24.1/ltmain.sh 2008-11-13 16:44:15.810994693 +0100
++++ bug-buddy-2.24.1/ltmain.sh 2008-04-29 22:21:21.000000000 +0200
@@ -1,83 +1,52 @@
-# Generated from ltmain.m4sh.
-
@@ -23788,7 +23847,7 @@
Index: bug-buddy-2.24.1/Makefile.in
===================================================================
--- bug-buddy-2.24.1.orig/Makefile.in 2008-10-19 12:42:34.000000000 +0200
-+++ bug-buddy-2.24.1/Makefile.in 2008-11-13 16:41:18.290986774 +0100
++++ bug-buddy-2.24.1/Makefile.in 2008-11-26 10:30:12.635358195 +0100
@@ -200,6 +200,11 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
@@ -23804,7 +23863,7 @@
Index: bug-buddy-2.24.1/src/Makefile.in
===================================================================
--- bug-buddy-2.24.1.orig/src/Makefile.in 2008-10-19 12:42:34.000000000 +0200
-+++ bug-buddy-2.24.1/src/Makefile.in 2008-11-13 16:41:18.198985696 +0100
++++ bug-buddy-2.24.1/src/Makefile.in 2008-11-26 10:30:12.535357916 +0100
@@ -212,6 +212,11 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
Modified: desktop/experimental/bug-buddy/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/bug-buddy/debian/patches/series?rev=17737&op=diff
==============================================================================
--- desktop/experimental/bug-buddy/debian/patches/series (original)
+++ desktop/experimental/bug-buddy/debian/patches/series Wed Nov 26 10:45:29 2008
@@ -1,4 +1,5 @@
01_double-free.patch
+02_disable_breakpad.patch
60_detect-and-link-x11.patch
70_automake-autoconf.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list