| 0 | |
cp /usr/share/gnome-doc-utils/gnome-doc-utils.make .
|
| 1 | |
aclocal
|
| 2 | |
automake -acf -Wno-portability
|
| 3 | |
autoconf
|
| 4 | |
rm -rf autom4te.cache/
|
| 5 | |
|
| 6 | |
diff -Nur -x '*.orig' -x '*~' gnome-user-docs-2.28.0/aclocal.m4 gnome-user-docs-2.28.0.new/aclocal.m4
|
| 7 | |
--- gnome-user-docs-2.28.0/aclocal.m4 2009-09-21 18:33:33.000000000 +0200
|
| 8 | |
+++ gnome-user-docs-2.28.0.new/aclocal.m4 2009-09-27 23:57:23.284815886 +0200
|
| 9 | |
@@ -1,7 +1,7 @@
|
| 10 | |
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
|
| 11 | |
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
|
| 12 | |
|
| 13 | |
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
| 14 | |
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
| 15 | |
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
| 16 | |
# This file is free software; the Free Software Foundation
|
| 17 | |
# gives unlimited permission to copy and/or distribute it,
|
| 18 | |
# with or without modifications, as long as this notice is preserved.
|
| 19 | |
@@ -13,8 +13,8 @@
|
| 20 | |
|
| 21 | |
m4_ifndef([AC_AUTOCONF_VERSION],
|
| 22 | |
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
| 23 | |
-m4_if(AC_AUTOCONF_VERSION, [2.63],,
|
| 24 | |
-[m4_warning([this file was generated for autoconf 2.63.
|
| 25 | |
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
|
| 26 | |
+[m4_warning([this file was generated for autoconf 2.64.
|
| 27 | |
You have another version of autoconf. It may work, but is not guaranteed to.
|
| 28 | |
If you have problems, you may need to regenerate the build system entirely.
|
| 29 | |
To do so, use the procedure documented by the package, typically `autoreconf'.])])
|
| 30 | |
@@ -144,14 +144,16 @@
|
| 31 | |
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
| 32 | |
# ---------------------------------------------
|
| 33 | |
m4_define([_PKG_CONFIG],
|
| 34 | |
-[if test -n "$$1"; then
|
| 35 | |
- pkg_cv_[]$1="$$1"
|
| 36 | |
- elif test -n "$PKG_CONFIG"; then
|
| 37 | |
- PKG_CHECK_EXISTS([$3],
|
| 38 | |
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
| 39 | |
- [pkg_failed=yes])
|
| 40 | |
- else
|
| 41 | |
- pkg_failed=untried
|
| 42 | |
+[if test -n "$PKG_CONFIG"; then
|
| 43 | |
+ if test -n "$$1"; then
|
| 44 | |
+ pkg_cv_[]$1="$$1"
|
| 45 | |
+ else
|
| 46 | |
+ PKG_CHECK_EXISTS([$3],
|
| 47 | |
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
| 48 | |
+ [pkg_failed=yes])
|
| 49 | |
+ fi
|
| 50 | |
+else
|
| 51 | |
+ pkg_failed=untried
|
| 52 | |
fi[]dnl
|
| 53 | |
])# _PKG_CONFIG
|
| 54 | |
|
| 55 | |
@@ -195,9 +197,9 @@
|
| 56 | |
if test $pkg_failed = yes; then
|
| 57 | |
_PKG_SHORT_ERRORS_SUPPORTED
|
| 58 | |
if test $_pkg_short_errors_supported = yes; then
|
| 59 | |
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
|
| 60 | |
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
|
| 61 | |
else
|
| 62 | |
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
|
| 63 | |
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
| 64 | |
fi
|
| 65 | |
# Put the nasty error message in config.log where it belongs
|
| 66 | |
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
| 67 | |
@@ -232,7 +234,7 @@
|
| 68 | |
fi[]dnl
|
| 69 | |
])# PKG_CHECK_MODULES
|
| 70 | |
|
| 71 | |
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
|
| 72 | |
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
| 73 | |
#
|
| 74 | |
# This file is free software; the Free Software Foundation
|
| 75 | |
# gives unlimited permission to copy and/or distribute it,
|
| 76 | |
@@ -244,10 +246,10 @@
|
| 77 | |
# generated from the m4 files accompanying Automake X.Y.
|
| 78 | |
# (This private macro should not be called outside this file.)
|
| 79 | |
AC_DEFUN([AM_AUTOMAKE_VERSION],
|
| 80 | |
-[am__api_version='1.10'
|
| 81 | |
+[am__api_version='1.11'
|
| 82 | |
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
| 83 | |
dnl require some minimum version. Point them to the right macro.
|
| 84 | |
-m4_if([$1], [1.10.1], [],
|
| 85 | |
+m4_if([$1], [1.11], [],
|
| 86 | |
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
| 87 | |
])
|
| 88 | |
|
| 89 | |
@@ -261,12 +263,12 @@
|
| 90 | |
# AM_SET_CURRENT_AUTOMAKE_VERSION
|
| 91 | |
# -------------------------------
|
| 92 | |
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
| 93 | |
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
| 94 | |
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
| 95 | |
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
| 96 | |
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
|
| 97 | |
+[AM_AUTOMAKE_VERSION([1.11])dnl
|
| 98 | |
m4_ifndef([AC_AUTOCONF_VERSION],
|
| 99 | |
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
| 100 | |
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
|
| 101 | |
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
| 102 | |
|
| 103 | |
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
| 104 | |
|
| 105 | |
@@ -323,14 +325,14 @@
|
| 106 | |
|
| 107 | |
# AM_CONDITIONAL -*- Autoconf -*-
|
| 108 | |
|
| 109 | |
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
|
| 110 | |
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
|
| 111 | |
# Free Software Foundation, Inc.
|
| 112 | |
#
|
| 113 | |
# This file is free software; the Free Software Foundation
|
| 114 | |
# gives unlimited permission to copy and/or distribute it,
|
| 115 | |
# with or without modifications, as long as this notice is preserved.
|
| 116 | |
|
| 117 | |
-# serial 8
|
| 118 | |
+# serial 9
|
| 119 | |
|
| 120 | |
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
| 121 | |
# -------------------------------------
|
| 122 | |
@@ -343,6 +345,7 @@
|
| 123 | |
AC_SUBST([$1_FALSE])dnl
|
| 124 | |
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
|
| 125 | |
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
|
| 126 | |
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
|
| 127 | |
if $2; then
|
| 128 | |
$1_TRUE=
|
| 129 | |
$1_FALSE='#'
|
| 130 | |
@@ -359,13 +362,13 @@
|
| 131 | |
# Do all the work for Automake. -*- Autoconf -*-
|
| 132 | |
|
| 133 | |
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
| 134 | |
-# 2005, 2006, 2008 Free Software Foundation, Inc.
|
| 135 | |
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
|
| 136 | |
#
|
| 137 | |
# This file is free software; the Free Software Foundation
|
| 138 | |
# gives unlimited permission to copy and/or distribute it,
|
| 139 | |
# with or without modifications, as long as this notice is preserved.
|
| 140 | |
|
| 141 | |
-# serial 13
|
| 142 | |
+# serial 16
|
| 143 | |
|
| 144 | |
# This macro actually does too much. Some checks are only needed if
|
| 145 | |
# your package does certain things. But this isn't really a big deal.
|
| 146 | |
@@ -382,7 +385,7 @@
|
| 147 | |
# arguments mandatory, and then we can depend on a new Autoconf
|
| 148 | |
# release and drop the old call support.
|
| 149 | |
AC_DEFUN([AM_INIT_AUTOMAKE],
|
| 150 | |
-[AC_PREREQ([2.60])dnl
|
| 151 | |
+[AC_PREREQ([2.62])dnl
|
| 152 | |
dnl Autoconf wants to disallow AM_ names. We explicitly allow
|
| 153 | |
dnl the ones we care about.
|
| 154 | |
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
| 155 | |
@@ -433,8 +436,8 @@
|
| 156 | |
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
|
| 157 | |
AM_MISSING_PROG(AUTOHEADER, autoheader)
|
| 158 | |
AM_MISSING_PROG(MAKEINFO, makeinfo)
|
| 159 | |
-AM_PROG_INSTALL_SH
|
| 160 | |
-AM_PROG_INSTALL_STRIP
|
| 161 | |
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
|
| 162 | |
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
|
| 163 | |
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
|
| 164 | |
# We need awk for the "check" target. The system "awk" is bad on
|
| 165 | |
# some platforms.
|
| 166 | |
@@ -442,24 +445,37 @@
|
| 167 | |
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
| 168 | |
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
| 169 | |
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
|
| 170 | |
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
| 171 | |
- [_AM_PROG_TAR([v7])])])
|
| 172 | |
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
| 173 | |
+ [_AM_PROG_TAR([v7])])])
|
| 174 | |
_AM_IF_OPTION([no-dependencies],,
|
| 175 | |
[AC_PROVIDE_IFELSE([AC_PROG_CC],
|
| 176 | |
- [_AM_DEPENDENCIES(CC)],
|
| 177 | |
- [define([AC_PROG_CC],
|
| 178 | |
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
| 179 | |
+ [_AM_DEPENDENCIES(CC)],
|
| 180 | |
+ [define([AC_PROG_CC],
|
| 181 | |
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
| 182 | |
AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
| 183 | |
- [_AM_DEPENDENCIES(CXX)],
|
| 184 | |
- [define([AC_PROG_CXX],
|
| 185 | |
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
| 186 | |
+ [_AM_DEPENDENCIES(CXX)],
|
| 187 | |
+ [define([AC_PROG_CXX],
|
| 188 | |
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
| 189 | |
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
|
| 190 | |
- [_AM_DEPENDENCIES(OBJC)],
|
| 191 | |
- [define([AC_PROG_OBJC],
|
| 192 | |
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
|
| 193 | |
+ [_AM_DEPENDENCIES(OBJC)],
|
| 194 | |
+ [define([AC_PROG_OBJC],
|
| 195 | |
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
|
| 196 | |
])
|
| 197 | |
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
|
| 198 | |
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
|
| 199 | |
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
|
| 200 | |
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
|
| 201 | |
+AC_CONFIG_COMMANDS_PRE(dnl
|
| 202 | |
+[m4_provide_if([_AM_COMPILER_EXEEXT],
|
| 203 | |
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
|
| 204 | |
])
|
| 205 | |
|
| 206 | |
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
|
| 207 | |
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
|
| 208 | |
+dnl mangled by Autoconf and run in a shell conditional statement.
|
| 209 | |
+m4_define([_AC_COMPILER_EXEEXT],
|
| 210 | |
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
|
| 211 | |
+
|
| 212 | |
|
| 213 | |
# When config.status generates a header, we must update the stamp-h file.
|
| 214 | |
# This file resides in the same directory as the config header
|
| 215 | |
@@ -482,7 +498,7 @@
|
| 216 | |
done
|
| 217 | |
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
| 218 | |
|
| 219 | |
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
| 220 | |
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
|
| 221 | |
#
|
| 222 | |
# This file is free software; the Free Software Foundation
|
| 223 | |
# gives unlimited permission to copy and/or distribute it,
|
| 224 | |
@@ -493,7 +509,14 @@
|
| 225 | |
# Define $install_sh.
|
| 226 | |
AC_DEFUN([AM_PROG_INSTALL_SH],
|
| 227 | |
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
| 228 | |
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
|
| 229 | |
+if test x"${install_sh}" != xset; then
|
| 230 | |
+ case $am_aux_dir in
|
| 231 | |
+ *\ * | *\ *)
|
| 232 | |
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
| 233 | |
+ *)
|
| 234 | |
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
|
| 235 | |
+ esac
|
| 236 | |
+fi
|
| 237 | |
AC_SUBST(install_sh)])
|
| 238 | |
|
| 239 | |
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
| 240 | |
@@ -520,27 +543,38 @@
|
| 241 | |
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
|
| 242 | |
# From Jim Meyering
|
| 243 | |
|
| 244 | |
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
|
| 245 | |
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
|
| 246 | |
# Free Software Foundation, Inc.
|
| 247 | |
#
|
| 248 | |
# This file is free software; the Free Software Foundation
|
| 249 | |
# gives unlimited permission to copy and/or distribute it,
|
| 250 | |
# with or without modifications, as long as this notice is preserved.
|
| 251 | |
|
| 252 | |
-# serial 4
|
| 253 | |
+# serial 5
|
| 254 | |
|
| 255 | |
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
|
| 256 | |
+# ----------------------------------
|
| 257 | |
+# Control maintainer-specific portions of Makefiles.
|
| 258 | |
+# Default is to disable them, unless `enable' is passed literally.
|
| 259 | |
+# For symmetry, `disable' may be passed as well. Anyway, the user
|
| 260 | |
+# can override the default with the --enable/--disable switch.
|
| 261 | |
AC_DEFUN([AM_MAINTAINER_MODE],
|
| 262 | |
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
| 263 | |
- dnl maintainer-mode is disabled by default
|
| 264 | |
- AC_ARG_ENABLE(maintainer-mode,
|
| 265 | |
-[ --enable-maintainer-mode enable make rules and dependencies not useful
|
| 266 | |
+[m4_case(m4_default([$1], [disable]),
|
| 267 | |
+ [enable], [m4_define([am_maintainer_other], [disable])],
|
| 268 | |
+ [disable], [m4_define([am_maintainer_other], [enable])],
|
| 269 | |
+ [m4_define([am_maintainer_other], [enable])
|
| 270 | |
+ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
|
| 271 | |
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
|
| 272 | |
+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
|
| 273 | |
+ AC_ARG_ENABLE([maintainer-mode],
|
| 274 | |
+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
|
| 275 | |
(and sometimes confusing) to the casual installer],
|
| 276 | |
- USE_MAINTAINER_MODE=$enableval,
|
| 277 | |
- USE_MAINTAINER_MODE=no)
|
| 278 | |
+ [USE_MAINTAINER_MODE=$enableval],
|
| 279 | |
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
|
| 280 | |
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
|
| 281 | |
- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
|
| 282 | |
+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
|
| 283 | |
MAINT=$MAINTAINER_MODE_TRUE
|
| 284 | |
- AC_SUBST(MAINT)dnl
|
| 285 | |
+ AC_SUBST([MAINT])dnl
|
| 286 | |
]
|
| 287 | |
)
|
| 288 | |
|
| 289 | |
@@ -548,14 +582,14 @@
|
| 290 | |
|
| 291 | |
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
| 292 | |
|
| 293 | |
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
|
| 294 | |
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
|
| 295 | |
# Free Software Foundation, Inc.
|
| 296 | |
#
|
| 297 | |
# This file is free software; the Free Software Foundation
|
| 298 | |
# gives unlimited permission to copy and/or distribute it,
|
| 299 | |
# with or without modifications, as long as this notice is preserved.
|
| 300 | |
|
| 301 | |
-# serial 5
|
| 302 | |
+# serial 6
|
| 303 | |
|
| 304 | |
# AM_MISSING_PROG(NAME, PROGRAM)
|
| 305 | |
# ------------------------------
|
| 306 | |
@@ -572,7 +606,14 @@
|
| 307 | |
AC_DEFUN([AM_MISSING_HAS_RUN],
|
| 308 | |
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
| 309 | |
AC_REQUIRE_AUX_FILE([missing])dnl
|
| 310 | |
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
| 311 | |
+if test x"${MISSING+set}" != xset; then
|
| 312 | |
+ case $am_aux_dir in
|
| 313 | |
+ *\ * | *\ *)
|
| 314 | |
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
|
| 315 | |
+ *)
|
| 316 | |
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
|
| 317 | |
+ esac
|
| 318 | |
+fi
|
| 319 | |
# Use eval to expand $SHELL
|
| 320 | |
if eval "$MISSING --run true"; then
|
| 321 | |
am_missing_run="$MISSING --run "
|
| 322 | |
@@ -610,13 +651,13 @@
|
| 323 | |
|
| 324 | |
# Helper functions for option handling. -*- Autoconf -*-
|
| 325 | |
|
| 326 | |
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
|
| 327 | |
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
|
| 328 | |
#
|
| 329 | |
# This file is free software; the Free Software Foundation
|
| 330 | |
# gives unlimited permission to copy and/or distribute it,
|
| 331 | |
# with or without modifications, as long as this notice is preserved.
|
| 332 | |
|
| 333 | |
-# serial 3
|
| 334 | |
+# serial 4
|
| 335 | |
|
| 336 | |
# _AM_MANGLE_OPTION(NAME)
|
| 337 | |
# -----------------------
|
| 338 | |
@@ -633,7 +674,7 @@
|
| 339 | |
# ----------------------------------
|
| 340 | |
# OPTIONS is a space-separated list of Automake options.
|
| 341 | |
AC_DEFUN([_AM_SET_OPTIONS],
|
| 342 | |
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
|
| 343 | |
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
|
| 344 | |
|
| 345 | |
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
|
| 346 | |
# -------------------------------------------
|
| 347 | |
@@ -643,14 +684,14 @@
|
| 348 | |
|
| 349 | |
# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
| 350 | |
|
| 351 | |
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
|
| 352 | |
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
|
| 353 | |
# Free Software Foundation, Inc.
|
| 354 | |
#
|
| 355 | |
# This file is free software; the Free Software Foundation
|
| 356 | |
# gives unlimited permission to copy and/or distribute it,
|
| 357 | |
# with or without modifications, as long as this notice is preserved.
|
| 358 | |
|
| 359 | |
-# serial 4
|
| 360 | |
+# serial 5
|
| 361 | |
|
| 362 | |
# AM_SANITY_CHECK
|
| 363 | |
# ---------------
|
| 364 | |
@@ -659,16 +700,29 @@
|
| 365 | |
# Just in case
|
| 366 | |
sleep 1
|
| 367 | |
echo timestamp > conftest.file
|
| 368 | |
+# Reject unsafe characters in $srcdir or the absolute working directory
|
| 369 | |
+# name. Accept space and tab only in the latter.
|
| 370 | |
+am_lf='
|
| 371 | |
+'
|
| 372 | |
+case `pwd` in
|
| 373 | |
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
|
| 374 | |
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
|
| 375 | |
+esac
|
| 376 | |
+case $srcdir in
|
| 377 | |
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
|
| 378 | |
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
|
| 379 | |
+esac
|
| 380 | |
+
|
| 381 | |
# Do `set' in a subshell so we don't clobber the current shell's
|
| 382 | |
# arguments. Must try -L first in case configure is actually a
|
| 383 | |
# symlink; some systems play weird games with the mod time of symlinks
|
| 384 | |
# (eg FreeBSD returns the mod time of the symlink's containing
|
| 385 | |
# directory).
|
| 386 | |
if (
|
| 387 | |
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
|
| 388 | |
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
|
| 389 | |
if test "$[*]" = "X"; then
|
| 390 | |
# -L didn't work.
|
| 391 | |
- set X `ls -t $srcdir/configure conftest.file`
|
| 392 | |
+ set X `ls -t "$srcdir/configure" conftest.file`
|
| 393 | |
fi
|
| 394 | |
rm -f conftest.file
|
| 395 | |
if test "$[*]" != "X $srcdir/configure conftest.file" \
|
| 396 | |
@@ -721,18 +775,25 @@
|
| 397 | |
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
| 398 | |
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
| 399 | |
|
| 400 | |
-# Copyright (C) 2006 Free Software Foundation, Inc.
|
| 401 | |
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
|
| 402 | |
#
|
| 403 | |
# This file is free software; the Free Software Foundation
|
| 404 | |
# gives unlimited permission to copy and/or distribute it,
|
| 405 | |
# with or without modifications, as long as this notice is preserved.
|
| 406 | |
|
| 407 | |
+# serial 2
|
| 408 | |
+
|
| 409 | |
# _AM_SUBST_NOTMAKE(VARIABLE)
|
| 410 | |
# ---------------------------
|
| 411 | |
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
|
| 412 | |
# This macro is traced by Automake.
|
| 413 | |
AC_DEFUN([_AM_SUBST_NOTMAKE])
|
| 414 | |
|
| 415 | |
+# AM_SUBST_NOTMAKE(VARIABLE)
|
| 416 | |
+# ---------------------------
|
| 417 | |
+# Public sister of _AM_SUBST_NOTMAKE.
|
| 418 | |
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
| 419 | |
+
|
| 420 | |
# Check how to create a tarball. -*- Autoconf -*-
|
| 421 | |
|
| 422 | |
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
| 423 | |
diff -Nur -x '*.orig' -x '*~' gnome-user-docs-2.28.0/configure gnome-user-docs-2.28.0.new/configure
|
| 424 | |
--- gnome-user-docs-2.28.0/configure 2009-09-21 18:33:33.000000000 +0200
|
| 425 | |
+++ gnome-user-docs-2.28.0.new/configure 2009-09-27 23:57:37.452874650 +0200
|
| 426 | |
@@ -1,20 +1,22 @@
|
| 427 | |
#! /bin/sh
|
| 428 | |
# Guess values for system-dependent variables and create Makefiles.
|
| 429 | |
-# Generated by GNU Autoconf 2.63 for gnome-user-docs 2.28.0.
|
| 430 | |
+# Generated by GNU Autoconf 2.64 for gnome-user-docs 2.28.0.
|
| 431 | |
#
|
| 432 | |
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-docs>.
|
| 433 | |
#
|
| 434 | |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
| 435 | |
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
| 436 | |
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
|
| 437 | |
+# Foundation, Inc.
|
| 438 | |
+#
|
| 439 | |
# This configure script is free software; the Free Software Foundation
|
| 440 | |
# gives unlimited permission to copy, distribute and modify it.
|
| 441 | |
-## --------------------- ##
|
| 442 | |
-## M4sh Initialization. ##
|
| 443 | |
-## --------------------- ##
|
| 444 | |
+## -------------------- ##
|
| 445 | |
+## M4sh Initialization. ##
|
| 446 | |
+## -------------------- ##
|
| 447 | |
|
| 448 | |
# Be more Bourne compatible
|
| 449 | |
DUALCASE=1; export DUALCASE # for MKS sh
|
| 450 | |
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
| 451 | |
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
|
| 452 | |
emulate sh
|
| 453 | |
NULLCMD=:
|
| 454 | |
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
| 455 | |
@@ -22,23 +24,15 @@
|
| 456 | |
alias -g '${1+"$@"}'='"$@"'
|
| 457 | |
setopt NO_GLOB_SUBST
|
| 458 | |
else
|
| 459 | |
- case `(set -o) 2>/dev/null` in
|
| 460 | |
- *posix*) set -o posix ;;
|
| 461 | |
+ case `(set -o) 2>/dev/null` in #(
|
| 462 | |
+ *posix*) :
|
| 463 | |
+ set -o posix ;; #(
|
| 464 | |
+ *) :
|
| 465 | |
+ ;;
|
| 466 | |
esac
|
| 467 | |
-
|
| 468 | |
fi
|
| 469 | |
|
| 470 | |
|
| 471 | |
-
|
| 472 | |
-
|
| 473 | |
-# PATH needs CR
|
| 474 | |
-# Avoid depending upon Character Ranges.
|
| 475 | |
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
| 476 | |
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
| 477 | |
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
| 478 | |
-as_cr_digits='0123456789'
|
| 479 | |
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
| 480 | |
-
|
| 481 | |
as_nl='
|
| 482 | |
'
|
| 483 | |
export as_nl
|
| 484 | |
@@ -46,7 +40,13 @@
|
| 485 | |
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
| 486 | |
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
|
| 487 | |
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
|
| 488 | |
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
| 489 | |
+# Prefer a ksh shell builtin over an external printf program on Solaris,
|
| 490 | |
+# but without wasting forks for bash or zsh.
|
| 491 | |
+if test -z "$BASH_VERSION$ZSH_VERSION" \
|
| 492 | |
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
|
| 493 | |
+ as_echo='print -r --'
|
| 494 | |
+ as_echo_n='print -rn --'
|
| 495 | |
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
| 496 | |
as_echo='printf %s\n'
|
| 497 | |
as_echo_n='printf %s'
|
| 498 | |
else
|
| 499 | |
@@ -57,7 +57,7 @@
|
| 500 | |
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
| 501 | |
as_echo_n_body='eval
|
| 502 | |
arg=$1;
|
| 503 | |
- case $arg in
|
| 504 | |
+ case $arg in #(
|
| 505 | |
*"$as_nl"*)
|
| 506 | |
expr "X$arg" : "X\\(.*\\)$as_nl";
|
| 507 | |
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
| 508 | |
@@ -80,13 +80,6 @@
|
| 509 | |
}
|
| 510 | |
fi
|
| 511 | |
|
| 512 | |
-# Support unset when possible.
|
| 513 | |
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
| 514 | |
- as_unset=unset
|
| 515 | |
-else
|
| 516 | |
- as_unset=false
|
| 517 | |
-fi
|
| 518 | |
-
|
| 519 | |
|
| 520 | |
# IFS
|
| 521 | |
# We need space, tab and new line, in precisely that order. Quoting is
|
| 522 | |
@@ -96,15 +89,15 @@
|
| 523 | |
IFS=" "" $as_nl"
|
| 524 | |
|
| 525 | |
# Find who we are. Look in the path if we contain no directory separator.
|
| 526 | |
-case $0 in
|
| 527 | |
+case $0 in #((
|
| 528 | |
*[\\/]* ) as_myself=$0 ;;
|
| 529 | |
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 530 | |
for as_dir in $PATH
|
| 531 | |
do
|
| 532 | |
IFS=$as_save_IFS
|
| 533 | |
test -z "$as_dir" && as_dir=.
|
| 534 | |
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
| 535 | |
-done
|
| 536 | |
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
| 537 | |
+ done
|
| 538 | |
IFS=$as_save_IFS
|
| 539 | |
|
| 540 | |
;;
|
| 541 | |
@@ -116,12 +109,16 @@
|
| 542 | |
fi
|
| 543 | |
if test ! -f "$as_myself"; then
|
| 544 | |
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
| 545 | |
- { (exit 1); exit 1; }
|
| 546 | |
+ exit 1
|
| 547 | |
fi
|
| 548 | |
|
| 549 | |
-# Work around bugs in pre-3.0 UWIN ksh.
|
| 550 | |
-for as_var in ENV MAIL MAILPATH
|
| 551 | |
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
| 552 | |
+# Unset variables that we do not need and which cause bugs (e.g. in
|
| 553 | |
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
|
| 554 | |
+# suppresses any "Segmentation fault" message there. '((' could
|
| 555 | |
+# trigger a bug in pdksh 5.2.14.
|
| 556 | |
+for as_var in BASH_ENV ENV MAIL MAILPATH
|
| 557 | |
+do eval test x\${$as_var+set} = xset \
|
| 558 | |
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
|
| 559 | |
done
|
| 560 | |
PS1='$ '
|
| 561 | |
PS2='> '
|
| 562 | |
@@ -133,330 +130,300 @@
|
| 563 | |
LANGUAGE=C
|
| 564 | |
export LANGUAGE
|
| 565 | |
|
| 566 | |
-# Required to use basename.
|
| 567 | |
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
| 568 | |
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
| 569 | |
- as_expr=expr
|
| 570 | |
-else
|
| 571 | |
- as_expr=false
|
| 572 | |
-fi
|
| 573 | |
-
|
| 574 | |
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
| 575 | |
- as_basename=basename
|
| 576 | |
-else
|
| 577 | |
- as_basename=false
|
| 578 | |
-fi
|
| 579 | |
-
|
| 580 | |
-
|
| 581 | |
-# Name of the executable.
|
| 582 | |
-as_me=`$as_basename -- "$0" ||
|
| 583 | |
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
| 584 | |
- X"$0" : 'X\(//\)$' \| \
|
| 585 | |
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
| 586 | |
-$as_echo X/"$0" |
|
| 587 | |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
|
| 588 | |
- s//\1/
|
| 589 | |
- q
|
| 590 | |
- }
|
| 591 | |
- /^X\/\(\/\/\)$/{
|
| 592 | |
- s//\1/
|
| 593 | |
- q
|
| 594 | |
- }
|
| 595 | |
- /^X\/\(\/\).*/{
|
| 596 | |
- s//\1/
|
| 597 | |
- q
|
| 598 | |
- }
|
| 599 | |
- s/.*/./; q'`
|
| 600 | |
-
|
| 601 | |
# CDPATH.
|
| 602 | |
-$as_unset CDPATH
|
| 603 | |
-
|
| 604 | |
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
| 605 | |
|
| 606 | |
if test "x$CONFIG_SHELL" = x; then
|
| 607 | |
- if (eval ":") 2>/dev/null; then
|
| 608 | |
- as_have_required=yes
|
| 609 | |
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
|
| 610 | |
+ emulate sh
|
| 611 | |
+ NULLCMD=:
|
| 612 | |
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
|
| 613 | |
+ # is contrary to our usage. Disable this feature.
|
| 614 | |
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
|
| 615 | |
+ setopt NO_GLOB_SUBST
|
| 616 | |
else
|
| 617 | |
- as_have_required=no
|
| 618 | |
+ case \`(set -o) 2>/dev/null\` in #(
|
| 619 | |
+ *posix*) :
|
| 620 | |
+ set -o posix ;; #(
|
| 621 | |
+ *) :
|
| 622 | |
+ ;;
|
| 623 | |
+esac
|
| 624 | |
fi
|
| 625 | |
-
|
| 626 | |
- if test $as_have_required = yes && (eval ":
|
| 627 | |
-(as_func_return () {
|
| 628 | |
- (exit \$1)
|
| 629 | |
-}
|
| 630 | |
-as_func_success () {
|
| 631 | |
- as_func_return 0
|
| 632 | |
-}
|
| 633 | |
-as_func_failure () {
|
| 634 | |
- as_func_return 1
|
| 635 | |
-}
|
| 636 | |
-as_func_ret_success () {
|
| 637 | |
- return 0
|
| 638 | |
-}
|
| 639 | |
-as_func_ret_failure () {
|
| 640 | |
- return 1
|
| 641 | |
-}
|
| 642 | |
+"
|
| 643 | |
+ as_required="as_fn_return () { (exit \$1); }
|
| 644 | |
+as_fn_success () { as_fn_return 0; }
|
| 645 | |
+as_fn_failure () { as_fn_return 1; }
|
| 646 | |
+as_fn_ret_success () { return 0; }
|
| 647 | |
+as_fn_ret_failure () { return 1; }
|
| 648 | |
|
| 649 | |
exitcode=0
|
| 650 | |
-if as_func_success; then
|
| 651 | |
- :
|
| 652 | |
-else
|
| 653 | |
- exitcode=1
|
| 654 | |
- echo as_func_success failed.
|
| 655 | |
-fi
|
| 656 | |
-
|
| 657 | |
-if as_func_failure; then
|
| 658 | |
- exitcode=1
|
| 659 | |
- echo as_func_failure succeeded.
|
| 660 | |
-fi
|
| 661 | |
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
|
| 662 | |
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
|
| 663 | |
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
|
| 664 | |
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
|
| 665 | |
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
|
| 666 | |
|
| 667 | |
-if as_func_ret_success; then
|
| 668 | |
- :
|
| 669 | |
else
|
| 670 | |
- exitcode=1
|
| 671 | |
- echo as_func_ret_success failed.
|
| 672 | |
-fi
|
| 673 | |
-
|
| 674 | |
-if as_func_ret_failure; then
|
| 675 | |
- exitcode=1
|
| 676 | |
- echo as_func_ret_failure succeeded.
|
| 677 | |
-fi
|
| 678 | |
-
|
| 679 | |
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
| 680 | |
- :
|
| 681 | |
+ exitcode=1; echo positional parameters were not saved.
|
| 682 | |
+fi
|
| 683 | |
+test x\$exitcode = x0 || exit 1"
|
| 684 | |
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
|
| 685 | |
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
|
| 686 | |
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
|
| 687 | |
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
|
| 688 | |
+ if (eval "$as_required") 2>/dev/null; then :
|
| 689 | |
+ as_have_required=yes
|
| 690 | |
else
|
| 691 | |
- exitcode=1
|
| 692 | |
- echo positional parameters were not saved.
|
| 693 | |
+ as_have_required=no
|
| 694 | |
fi
|
| 695 | |
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
|
| 696 | |
|
| 697 | |
-test \$exitcode = 0) || { (exit 1); exit 1; }
|
| 698 | |
-
|
| 699 | |
-(
|
| 700 | |
- as_lineno_1=\$LINENO
|
| 701 | |
- as_lineno_2=\$LINENO
|
| 702 | |
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
|
| 703 | |
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
|
| 704 | |
-") 2> /dev/null; then
|
| 705 | |
- :
|
| 706 | |
else
|
| 707 | |
- as_candidate_shells=
|
| 708 | |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 709 | |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 710 | |
+as_found=false
|
| 711 | |
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
| 712 | |
do
|
| 713 | |
IFS=$as_save_IFS
|
| 714 | |
test -z "$as_dir" && as_dir=.
|
| 715 | |
- case $as_dir in
|
| 716 | |
+ as_found=:
|
| 717 | |
+ case $as_dir in #(
|
| 718 | |
/*)
|
| 719 | |
for as_base in sh bash ksh sh5; do
|
| 720 | |
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
|
| 721 | |
+ # Try only shells that exist, to save several forks.
|
| 722 | |
+ as_shell=$as_dir/$as_base
|
| 723 | |
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
| 724 | |
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
|
| 725 | |
+ CONFIG_SHELL=$as_shell as_have_required=yes
|
| 726 | |
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
|
| 727 | |
+ break 2
|
| 728 | |
+fi
|
| 729 | |
+fi
|
| 730 | |
done;;
|
| 731 | |
esac
|
| 732 | |
+ as_found=false
|
| 733 | |
done
|
| 734 | |
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
|
| 735 | |
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
|
| 736 | |
+ CONFIG_SHELL=$SHELL as_have_required=yes
|
| 737 | |
+fi; }
|
| 738 | |
IFS=$as_save_IFS
|
| 739 | |
|
| 740 | |
|
| 741 | |
- for as_shell in $as_candidate_shells $SHELL; do
|
| 742 | |
- # Try only shells that exist, to save several forks.
|
| 743 | |
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
| 744 | |
- { ("$as_shell") 2> /dev/null <<\_ASEOF
|
| 745 | |
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
| 746 | |
- emulate sh
|
| 747 | |
- NULLCMD=:
|
| 748 | |
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
| 749 | |
- # is contrary to our usage. Disable this feature.
|
| 750 | |
- alias -g '${1+"$@"}'='"$@"'
|
| 751 | |
- setopt NO_GLOB_SUBST
|
| 752 | |
-else
|
| 753 | |
- case `(set -o) 2>/dev/null` in
|
| 754 | |
- *posix*) set -o posix ;;
|
| 755 | |
-esac
|
| 756 | |
-
|
| 757 | |
-fi
|
| 758 | |
-
|
| 759 | |
-
|
| 760 | |
-:
|
| 761 | |
-_ASEOF
|
| 762 | |
-}; then
|
| 763 | |
- CONFIG_SHELL=$as_shell
|
| 764 | |
- as_have_required=yes
|
| 765 | |
- if { "$as_shell" 2> /dev/null <<\_ASEOF
|
| 766 | |
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
| 767 | |
- emulate sh
|
| 768 | |
- NULLCMD=:
|
| 769 | |
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
| 770 | |
- # is contrary to our usage. Disable this feature.
|
| 771 | |
- alias -g '${1+"$@"}'='"$@"'
|
| 772 | |
- setopt NO_GLOB_SUBST
|
| 773 | |
-else
|
| 774 | |
- case `(set -o) 2>/dev/null` in
|
| 775 | |
- *posix*) set -o posix ;;
|
| 776 | |
-esac
|
| 777 | |
-
|
| 778 | |
-fi
|
| 779 | |
-
|
| 780 | |
-
|
| 781 | |
-:
|
| 782 | |
-(as_func_return () {
|
| 783 | |
- (exit $1)
|
| 784 | |
-}
|
| 785 | |
-as_func_success () {
|
| 786 | |
- as_func_return 0
|
| 787 | |
-}
|
| 788 | |
-as_func_failure () {
|
| 789 | |
- as_func_return 1
|
| 790 | |
-}
|
| 791 | |
-as_func_ret_success () {
|
| 792 | |
- return 0
|
| 793 | |
-}
|
| 794 | |
-as_func_ret_failure () {
|
| 795 | |
- return 1
|
| 796 | |
-}
|
| 797 | |
-
|
| 798 | |
-exitcode=0
|
| 799 | |
-if as_func_success; then
|
| 800 | |
- :
|
| 801 | |
-else
|
| 802 | |
- exitcode=1
|
| 803 | |
- echo as_func_success failed.
|
| 804 | |
-fi
|
| 805 | |
-
|
| 806 | |
-if as_func_failure; then
|
| 807 | |
- exitcode=1
|
| 808 | |
- echo as_func_failure succeeded.
|
| 809 | |
-fi
|
| 810 | |
-
|
| 811 | |
-if as_func_ret_success; then
|
| 812 | |
- :
|
| 813 | |
-else
|
| 814 | |
- exitcode=1
|
| 815 | |
- echo as_func_ret_success failed.
|
| 816 | |
-fi
|
| 817 | |
-
|
| 818 | |
-if as_func_ret_failure; then
|
| 819 | |
- exitcode=1
|
| 820 | |
- echo as_func_ret_failure succeeded.
|
| 821 | |
+ if test "x$CONFIG_SHELL" != x; then :
|
| 822 | |
+ # We cannot yet assume a decent shell, so we have to provide a
|
| 823 | |
+ # neutralization value for shells without unset; and this also
|
| 824 | |
+ # works around shells that cannot unset nonexistent variables.
|
| 825 | |
+ BASH_ENV=/dev/null
|
| 826 | |
+ ENV=/dev/null
|
| 827 | |
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
| 828 | |
+ export CONFIG_SHELL
|
| 829 | |
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
| 830 | |
fi
|
| 831 | |
|
| 832 | |
-if ( set x; as_func_ret_success y && test x = "$1" ); then
|
| 833 | |
- :
|
| 834 | |
-else
|
| 835 | |
- exitcode=1
|
| 836 | |
- echo positional parameters were not saved.
|
| 837 | |
+ if test x$as_have_required = xno; then :
|
| 838 | |
+ $as_echo "$0: This script requires a shell more modern than all"
|
| 839 | |
+ $as_echo "$0: the shells that I found on your system."
|
| 840 | |
+ if test x${ZSH_VERSION+set} = xset ; then
|
| 841 | |
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
|
| 842 | |
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
|
| 843 | |
+ else
|
| 844 | |
+ $as_echo "$0: Please tell bug-autoconf@gnu.org and
|
| 845 | |
+$0: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-docs
|
| 846 | |
+$0: about your system, including any error possibly output
|
| 847 | |
+$0: before this message. Then install a modern shell, or
|
| 848 | |
+$0: manually run the script under such a shell if you do
|
| 849 | |
+$0: have one."
|
| 850 | |
+ fi
|
| 851 | |
+ exit 1
|
| 852 | |
fi
|
| 853 | |
-
|
| 854 | |
-test $exitcode = 0) || { (exit 1); exit 1; }
|
| 855 | |
-
|
| 856 | |
-(
|
| 857 | |
- as_lineno_1=$LINENO
|
| 858 | |
- as_lineno_2=$LINENO
|
| 859 | |
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
| 860 | |
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
|
| 861 | |
-
|
| 862 | |
-_ASEOF
|
| 863 | |
-}; then
|
| 864 | |
- break
|
| 865 | |
fi
|
| 866 | |
-
|
| 867 | |
fi
|
| 868 | |
+SHELL=${CONFIG_SHELL-/bin/sh}
|
| 869 | |
+export SHELL
|
| 870 | |
+# Unset more variables known to interfere with behavior of common tools.
|
| 871 | |
+CLICOLOR_FORCE= GREP_OPTIONS=
|
| 872 | |
+unset CLICOLOR_FORCE GREP_OPTIONS
|
| 873 | |
|
| 874 | |
- done
|
| 875 | |
-
|
| 876 | |
- if test "x$CONFIG_SHELL" != x; then
|
| 877 | |
- for as_var in BASH_ENV ENV
|
| 878 | |
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
| 879 | |
- done
|
| 880 | |
- export CONFIG_SHELL
|
| 881 | |
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
| 882 | |
-fi
|
| 883 | |
+## --------------------- ##
|
| 884 | |
+## M4sh Shell Functions. ##
|
| 885 | |
+## --------------------- ##
|
| 886 | |
+# as_fn_unset VAR
|
| 887 | |
+# ---------------
|
| 888 | |
+# Portably unset VAR.
|
| 889 | |
+as_fn_unset ()
|
| 890 | |
+{
|
| 891 | |
+ { eval $1=; unset $1;}
|
| 892 | |
+}
|
| 893 | |
+as_unset=as_fn_unset
|
| 894 | |
|
| 895 | |
+# as_fn_set_status STATUS
|
| 896 | |
+# -----------------------
|
| 897 | |
+# Set $? to STATUS, without forking.
|
| 898 | |
+as_fn_set_status ()
|
| 899 | |
+{
|
| 900 | |
+ return $1
|
| 901 | |
+} # as_fn_set_status
|
| 902 | |
|
| 903 | |
- if test $as_have_required = no; then
|
| 904 | |
- echo This script requires a shell more modern than all the
|
| 905 | |
- echo shells that I found on your system. Please install a
|
| 906 | |
- echo modern shell, or manually run the script under such a
|
| 907 | |
- echo shell if you do have one.
|
| 908 | |
- { (exit 1); exit 1; }
|
| 909 | |
-fi
|
| 910 | |
+# as_fn_exit STATUS
|
| 911 | |
+# -----------------
|
| 912 | |
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
|
| 913 | |
+as_fn_exit ()
|
| 914 | |
+{
|
| 915 | |
+ set +e
|
| 916 | |
+ as_fn_set_status $1
|
| 917 | |
+ exit $1
|
| 918 | |
+} # as_fn_exit
|
| 919 | |
+
|
| 920 | |
+# as_fn_mkdir_p
|
| 921 | |
+# -------------
|
| 922 | |
+# Create "$as_dir" as a directory, including parents if necessary.
|
| 923 | |
+as_fn_mkdir_p ()
|
| 924 | |
+{
|
| 925 | |
|
| 926 | |
+ case $as_dir in #(
|
| 927 | |
+ -*) as_dir=./$as_dir;;
|
| 928 | |
+ esac
|
| 929 | |
+ test -d "$as_dir" || eval $as_mkdir_p || {
|
| 930 | |
+ as_dirs=
|
| 931 | |
+ while :; do
|
| 932 | |
+ case $as_dir in #(
|
| 933 | |
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
|
| 934 | |
+ *) as_qdir=$as_dir;;
|
| 935 | |
+ esac
|
| 936 | |
+ as_dirs="'$as_qdir' $as_dirs"
|
| 937 | |
+ as_dir=`$as_dirname -- "$as_dir" ||
|
| 938 | |
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
| 939 | |
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
| 940 | |
+ X"$as_dir" : 'X\(//\)$' \| \
|
| 941 | |
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
| 942 | |
+$as_echo X"$as_dir" |
|
| 943 | |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
| 944 | |
+ s//\1/
|
| 945 | |
+ q
|
| 946 | |
+ }
|
| 947 | |
+ /^X\(\/\/\)[^/].*/{
|
| 948 | |
+ s//\1/
|
| 949 | |
+ q
|
| 950 | |
+ }
|
| 951 | |
+ /^X\(\/\/\)$/{
|
| 952 | |
+ s//\1/
|
| 953 | |
+ q
|
| 954 | |
+ }
|
| 955 | |
+ /^X\(\/\).*/{
|
| 956 | |
+ s//\1/
|
| 957 | |
+ q
|
| 958 | |
+ }
|
| 959 | |
+ s/.*/./; q'`
|
| 960 | |
+ test -d "$as_dir" && break
|
| 961 | |
+ done
|
| 962 | |
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
| 963 | |
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
| 964 | |
|
| 965 | |
-fi
|
| 966 | |
|
| 967 | |
-fi
|
| 968 | |
+} # as_fn_mkdir_p
|
| 969 | |
+# as_fn_append VAR VALUE
|
| 970 | |
+# ----------------------
|
| 971 | |
+# Append the text in VALUE to the end of the definition contained in VAR. Take
|
| 972 | |
+# advantage of any shell optimizations that allow amortized linear growth over
|
| 973 | |
+# repeated appends, instead of the typical quadratic growth present in naive
|
| 974 | |
+# implementations.
|
| 975 | |
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
|
| 976 | |
+ eval 'as_fn_append ()
|
| 977 | |
+ {
|
| 978 | |
+ eval $1+=\$2
|
| 979 | |
+ }'
|
| 980 | |
+else
|
| 981 | |
+ as_fn_append ()
|
| 982 | |
+ {
|
| 983 | |
+ eval $1=\$$1\$2
|
| 984 | |
+ }
|
| 985 | |
+fi # as_fn_append
|
| 986 | |
|
| 987 | |
+# as_fn_arith ARG...
|
| 988 | |
+# ------------------
|
| 989 | |
+# Perform arithmetic evaluation on the ARGs, and store the result in the
|
| 990 | |
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
|
| 991 | |
+# must be portable across $(()) and expr.
|
| 992 | |
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
|
| 993 | |
+ eval 'as_fn_arith ()
|
| 994 | |
+ {
|
| 995 | |
+ as_val=$(( $* ))
|
| 996 | |
+ }'
|
| 997 | |
+else
|
| 998 | |
+ as_fn_arith ()
|
| 999 | |
+ {
|
| 1000 | |
+ as_val=`expr "$@" || test $? -eq 1`
|
| 1001 | |
+ }
|
| 1002 | |
+fi # as_fn_arith
|
| 1003 | |
|
| 1004 | |
|
| 1005 | |
-(eval "as_func_return () {
|
| 1006 | |
- (exit \$1)
|
| 1007 | |
-}
|
| 1008 | |
-as_func_success () {
|
| 1009 | |
- as_func_return 0
|
| 1010 | |
-}
|
| 1011 | |
-as_func_failure () {
|
| 1012 | |
- as_func_return 1
|
| 1013 | |
-}
|
| 1014 | |
-as_func_ret_success () {
|
| 1015 | |
- return 0
|
| 1016 | |
-}
|
| 1017 | |
-as_func_ret_failure () {
|
| 1018 | |
- return 1
|
| 1019 | |
-}
|
| 1020 | |
+# as_fn_error ERROR [LINENO LOG_FD]
|
| 1021 | |
+# ---------------------------------
|
| 1022 | |
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
| 1023 | |
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
| 1024 | |
+# script with status $?, using 1 if that was 0.
|
| 1025 | |
+as_fn_error ()
|
| 1026 | |
+{
|
| 1027 | |
+ as_status=$?; test $as_status -eq 0 && as_status=1
|
| 1028 | |
+ if test "$3"; then
|
| 1029 | |
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
| 1030 | |
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
| 1031 | |
+ fi
|
| 1032 | |
+ $as_echo "$as_me: error: $1" >&2
|
| 1033 | |
+ as_fn_exit $as_status
|
| 1034 | |
+} # as_fn_error
|
| 1035 | |
|
| 1036 | |
-exitcode=0
|
| 1037 | |
-if as_func_success; then
|
| 1038 | |
- :
|
| 1039 | |
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
| 1040 | |
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
| 1041 | |
+ as_expr=expr
|
| 1042 | |
else
|
| 1043 | |
- exitcode=1
|
| 1044 | |
- echo as_func_success failed.
|
| 1045 | |
-fi
|
| 1046 | |
-
|
| 1047 | |
-if as_func_failure; then
|
| 1048 | |
- exitcode=1
|
| 1049 | |
- echo as_func_failure succeeded.
|
| 1050 | |
+ as_expr=false
|
| 1051 | |
fi
|
| 1052 | |
|
| 1053 | |
-if as_func_ret_success; then
|
| 1054 | |
- :
|
| 1055 | |
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
| 1056 | |
+ as_basename=basename
|
| 1057 | |
else
|
| 1058 | |
- exitcode=1
|
| 1059 | |
- echo as_func_ret_success failed.
|
| 1060 | |
-fi
|
| 1061 | |
-
|
| 1062 | |
-if as_func_ret_failure; then
|
| 1063 | |
- exitcode=1
|
| 1064 | |
- echo as_func_ret_failure succeeded.
|
| 1065 | |
+ as_basename=false
|
| 1066 | |
fi
|
| 1067 | |
|
| 1068 | |
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
| 1069 | |
- :
|
| 1070 | |
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
| 1071 | |
+ as_dirname=dirname
|
| 1072 | |
else
|
| 1073 | |
- exitcode=1
|
| 1074 | |
- echo positional parameters were not saved.
|
| 1075 | |
+ as_dirname=false
|
| 1076 | |
fi
|
| 1077 | |
|
| 1078 | |
-test \$exitcode = 0") || {
|
| 1079 | |
- echo No shell found that supports shell functions.
|
| 1080 | |
- echo Please tell bug-autoconf@gnu.org about your system,
|
| 1081 | |
- echo including any error possibly output before this message.
|
| 1082 | |
- echo This can help us improve future autoconf versions.
|
| 1083 | |
- echo Configuration will now proceed without shell functions.
|
| 1084 | |
-}
|
| 1085 | |
+as_me=`$as_basename -- "$0" ||
|
| 1086 | |
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
| 1087 | |
+ X"$0" : 'X\(//\)$' \| \
|
| 1088 | |
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
| 1089 | |
+$as_echo X/"$0" |
|
| 1090 | |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
| 1091 | |
+ s//\1/
|
| 1092 | |
+ q
|
| 1093 | |
+ }
|
| 1094 | |
+ /^X\/\(\/\/\)$/{
|
| 1095 | |
+ s//\1/
|
| 1096 | |
+ q
|
| 1097 | |
+ }
|
| 1098 | |
+ /^X\/\(\/\).*/{
|
| 1099 | |
+ s//\1/
|
| 1100 | |
+ q
|
| 1101 | |
+ }
|
| 1102 | |
+ s/.*/./; q'`
|
| 1103 | |
|
| 1104 | |
+# Avoid depending upon Character Ranges.
|
| 1105 | |
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
| 1106 | |
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
| 1107 | |
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
| 1108 | |
+as_cr_digits='0123456789'
|
| 1109 | |
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
| 1110 | |
|
| 1111 | |
|
| 1112 | |
- as_lineno_1=$LINENO
|
| 1113 | |
- as_lineno_2=$LINENO
|
| 1114 | |
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
| 1115 | |
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
| 1116 | |
-
|
| 1117 | |
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
| 1118 | |
- # uniformly replaced by the line number. The first 'sed' inserts a
|
| 1119 | |
- # line-number line after each line using $LINENO; the second 'sed'
|
| 1120 | |
- # does the real work. The second script uses 'N' to pair each
|
| 1121 | |
- # line-number line with the line containing $LINENO, and appends
|
| 1122 | |
- # trailing '-' during substitution so that $LINENO is not a special
|
| 1123 | |
- # case at line end.
|
| 1124 | |
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
| 1125 | |
- # scripts with optimization help from Paolo Bonzini. Blame Lee
|
| 1126 | |
- # E. McMahon (1931-1989) for sed's syntax. :-)
|
| 1127 | |
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
|
| 1128 | |
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
|
| 1129 | |
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
|
| 1130 | |
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
|
| 1131 | |
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
|
| 1132 | |
sed -n '
|
| 1133 | |
p
|
| 1134 | |
/[$]LINENO/=
|
| 1135 | |
@@ -473,8 +440,7 @@
|
| 1136 | |
s/-\n.*//
|
| 1137 | |
' >$as_me.lineno &&
|
| 1138 | |
chmod +x "$as_me.lineno" ||
|
| 1139 | |
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
| 1140 | |
- { (exit 1); exit 1; }; }
|
| 1141 | |
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
|
| 1142 | |
|
| 1143 | |
# Don't try to exec as it changes $[0], causing all sort of problems
|
| 1144 | |
# (the dirname of $[0] is not the place where we might find the
|
| 1145 | |
@@ -484,29 +450,18 @@
|
| 1146 | |
exit
|
| 1147 | |
}
|
| 1148 | |
|
| 1149 | |
-
|
| 1150 | |
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
| 1151 | |
- as_dirname=dirname
|
| 1152 | |
-else
|
| 1153 | |
- as_dirname=false
|
| 1154 | |
-fi
|
| 1155 | |
-
|
| 1156 | |
ECHO_C= ECHO_N= ECHO_T=
|
| 1157 | |
-case `echo -n x` in
|
| 1158 | |
+case `echo -n x` in #(((((
|
| 1159 | |
-n*)
|
| 1160 | |
- case `echo 'x\c'` in
|
| 1161 | |
+ case `echo 'xy\c'` in
|
| 1162 | |
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
| 1163 | |
- *) ECHO_C='\c';;
|
| 1164 | |
+ xy) ECHO_C='\c';;
|
| 1165 | |
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
|
| 1166 | |
+ ECHO_T=' ';;
|
| 1167 | |
esac;;
|
| 1168 | |
*)
|
| 1169 | |
ECHO_N='-n';;
|
| 1170 | |
esac
|
| 1171 | |
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
| 1172 | |
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
| 1173 | |
- as_expr=expr
|
| 1174 | |
-else
|
| 1175 | |
- as_expr=false
|
| 1176 | |
-fi
|
| 1177 | |
|
| 1178 | |
rm -f conf$$ conf$$.exe conf$$.file
|
| 1179 | |
if test -d conf$$.dir; then
|
| 1180 | |
@@ -536,7 +491,7 @@
|
| 1181 | |
rmdir conf$$.dir 2>/dev/null
|
| 1182 | |
|
| 1183 | |
if mkdir -p . 2>/dev/null; then
|
| 1184 | |
- as_mkdir_p=:
|
| 1185 | |
+ as_mkdir_p='mkdir -p "$as_dir"'
|
| 1186 | |
else
|
| 1187 | |
test -d ./-p && rmdir ./-p
|
| 1188 | |
as_mkdir_p=false
|
| 1189 | |
@@ -555,10 +510,10 @@
|
| 1190 | |
if test -d "$1"; then
|
| 1191 | |
test -d "$1/.";
|
| 1192 | |
else
|
| 1193 | |
- case $1 in
|
| 1194 | |
+ case $1 in #(
|
| 1195 | |
-*)set "./$1";;
|
| 1196 | |
esac;
|
| 1197 | |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
| 1198 | |
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
| 1199 | |
???[sx]*):;;*)false;;esac;fi
|
| 1200 | |
'\'' sh
|
| 1201 | |
'
|
| 1202 | |
@@ -572,7 +527,6 @@
|
| 1203 | |
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
| 1204 | |
|
| 1205 | |
|
| 1206 | |
-
|
| 1207 | |
exec 7<&0 </dev/null 6>&1
|
| 1208 | |
|
| 1209 | |
# Name of the host.
|
| 1210 | |
@@ -591,7 +545,6 @@
|
| 1211 | |
subdirs=
|
| 1212 | |
MFLAGS=
|
| 1213 | |
MAKEFLAGS=
|
| 1214 | |
-SHELL=${CONFIG_SHELL-/bin/sh}
|
| 1215 | |
|
| 1216 | |
# Identity of this package.
|
| 1217 | |
PACKAGE_NAME='gnome-user-docs'
|
| 1218 | |
@@ -599,6 +552,7 @@
|
| 1219 | |
PACKAGE_VERSION='2.28.0'
|
| 1220 | |
PACKAGE_STRING='gnome-user-docs 2.28.0'
|
| 1221 | |
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-docs'
|
| 1222 | |
+PACKAGE_URL=''
|
| 1223 | |
|
| 1224 | |
ac_subst_vars='LTLIBOBJS
|
| 1225 | |
LIBOBJS
|
| 1226 | |
@@ -670,6 +624,7 @@
|
| 1227 | |
program_transform_name
|
| 1228 | |
prefix
|
| 1229 | |
exec_prefix
|
| 1230 | |
+PACKAGE_URL
|
| 1231 | |
PACKAGE_BUGREPORT
|
| 1232 | |
PACKAGE_STRING
|
| 1233 | |
PACKAGE_VERSION
|
| 1234 | |
@@ -800,8 +755,7 @@
|
| 1235 | |
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
| 1236 | |
# Reject names that are not valid shell variable names.
|
| 1237 | |
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
| 1238 | |
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
|
| 1239 | |
- { (exit 1); exit 1; }; }
|
| 1240 | |
+ as_fn_error "invalid feature name: $ac_useropt"
|
| 1241 | |
ac_useropt_orig=$ac_useropt
|
| 1242 | |
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
| 1243 | |
case $ac_user_opts in
|
| 1244 | |
@@ -827,8 +781,7 @@
|
| 1245 | |
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
| 1246 | |
# Reject names that are not valid shell variable names.
|
| 1247 | |
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
| 1248 | |
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
|
| 1249 | |
- { (exit 1); exit 1; }; }
|
| 1250 | |
+ as_fn_error "invalid feature name: $ac_useropt"
|
| 1251 | |
ac_useropt_orig=$ac_useropt
|
| 1252 | |
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
| 1253 | |
case $ac_user_opts in
|
| 1254 | |
@@ -1032,8 +985,7 @@
|
| 1255 | |
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
| 1256 | |
# Reject names that are not valid shell variable names.
|
| 1257 | |
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
| 1258 | |
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
|
| 1259 | |
- { (exit 1); exit 1; }; }
|
| 1260 | |
+ as_fn_error "invalid package name: $ac_useropt"
|
| 1261 | |
ac_useropt_orig=$ac_useropt
|
| 1262 | |
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
| 1263 | |
case $ac_user_opts in
|
| 1264 | |
@@ -1049,8 +1001,7 @@
|
| 1265 | |
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
| 1266 | |
# Reject names that are not valid shell variable names.
|
| 1267 | |
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
| 1268 | |
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
|
| 1269 | |
- { (exit 1); exit 1; }; }
|
| 1270 | |
+ as_fn_error "invalid package name: $ac_useropt"
|
| 1271 | |
ac_useropt_orig=$ac_useropt
|
| 1272 | |
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
| 1273 | |
case $ac_user_opts in
|
| 1274 | |
@@ -1080,17 +1031,17 @@
|
| 1275 | |
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
| 1276 | |
x_libraries=$ac_optarg ;;
|
| 1277 | |
|
| 1278 | |
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
|
| 1279 | |
-Try \`$0 --help' for more information." >&2
|
| 1280 | |
- { (exit 1); exit 1; }; }
|
| 1281 | |
+ -*) as_fn_error "unrecognized option: \`$ac_option'
|
| 1282 | |
+Try \`$0 --help' for more information."
|
| 1283 | |
;;
|
| 1284 | |
|
| 1285 | |
*=*)
|
| 1286 | |
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
|
| 1287 | |
# Reject names that are not valid shell variable names.
|
| 1288 | |
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
|
| 1289 | |
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
|
| 1290 | |
- { (exit 1); exit 1; }; }
|
| 1291 | |
+ case $ac_envvar in #(
|
| 1292 | |
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
|
| 1293 | |
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
|
| 1294 | |
+ esac
|
| 1295 | |
eval $ac_envvar=\$ac_optarg
|
| 1296 | |
export $ac_envvar ;;
|
| 1297 | |
|
| 1298 | |
@@ -1107,15 +1058,13 @@
|
| 1299 | |
|
| 1300 | |
if test -n "$ac_prev"; then
|
| 1301 | |
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
| 1302 | |
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
|
| 1303 | |
- { (exit 1); exit 1; }; }
|
| 1304 | |
+ as_fn_error "missing argument to $ac_option"
|
| 1305 | |
fi
|
| 1306 | |
|
| 1307 | |
if test -n "$ac_unrecognized_opts"; then
|
| 1308 | |
case $enable_option_checking in
|
| 1309 | |
no) ;;
|
| 1310 | |
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
|
| 1311 | |
- { (exit 1); exit 1; }; } ;;
|
| 1312 | |
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
|
| 1313 | |
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
| 1314 | |
esac
|
| 1315 | |
fi
|
| 1316 | |
@@ -1138,8 +1087,7 @@
|
| 1317 | |
[\\/$]* | ?:[\\/]* ) continue;;
|
| 1318 | |
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
| 1319 | |
esac
|
| 1320 | |
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
| 1321 | |
- { (exit 1); exit 1; }; }
|
| 1322 | |
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
|
| 1323 | |
done
|
| 1324 | |
|
| 1325 | |
# There might be people who depend on the old broken behavior: `$host'
|
| 1326 | |
@@ -1169,11 +1117,9 @@
|
| 1327 | |
ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
| 1328 | |
ac_ls_di=`ls -di .` &&
|
| 1329 | |
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
| 1330 | |
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
|
| 1331 | |
- { (exit 1); exit 1; }; }
|
| 1332 | |
+ as_fn_error "working directory cannot be determined"
|
| 1333 | |
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
| 1334 | |
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
|
| 1335 | |
- { (exit 1); exit 1; }; }
|
| 1336 | |
+ as_fn_error "pwd does not report name of working directory"
|
| 1337 | |
|
| 1338 | |
|
| 1339 | |
# Find the source files, if location was not specified.
|
| 1340 | |
@@ -1212,13 +1158,11 @@
|
| 1341 | |
fi
|
| 1342 | |
if test ! -r "$srcdir/$ac_unique_file"; then
|
| 1343 | |
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
| 1344 | |
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
| 1345 | |
- { (exit 1); exit 1; }; }
|
| 1346 | |
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
|
| 1347 | |
fi
|
| 1348 | |
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
| 1349 | |
ac_abs_confdir=`(
|
| 1350 | |
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
|
| 1351 | |
- { (exit 1); exit 1; }; }
|
| 1352 | |
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
|
| 1353 | |
pwd)`
|
| 1354 | |
# When building in place, set srcdir=.
|
| 1355 | |
if test "$ac_abs_confdir" = "$ac_pwd"; then
|
| 1356 | |
@@ -1404,21 +1348,24 @@
|
| 1357 | |
if $ac_init_version; then
|
| 1358 | |
cat <<\_ACEOF
|
| 1359 | |
gnome-user-docs configure 2.28.0
|
| 1360 | |
-generated by GNU Autoconf 2.63
|
| 1361 | |
+generated by GNU Autoconf 2.64
|
| 1362 | |
|
| 1363 | |
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
| 1364 | |
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
| 1365 | |
+Copyright (C) 2009 Free Software Foundation, Inc.
|
| 1366 | |
This configure script is free software; the Free Software Foundation
|
| 1367 | |
gives unlimited permission to copy, distribute and modify it.
|
| 1368 | |
_ACEOF
|
| 1369 | |
exit
|
| 1370 | |
fi
|
| 1371 | |
+
|
| 1372 | |
+## ------------------------ ##
|
| 1373 | |
+## Autoconf initialization. ##
|
| 1374 | |
+## ------------------------ ##
|
| 1375 | |
cat >config.log <<_ACEOF
|
| 1376 | |
This file contains any messages produced by compilers while
|
| 1377 | |
running configure, to aid debugging if configure makes a mistake.
|
| 1378 | |
|
| 1379 | |
It was created by gnome-user-docs $as_me 2.28.0, which was
|
| 1380 | |
-generated by GNU Autoconf 2.63. Invocation command line was
|
| 1381 | |
+generated by GNU Autoconf 2.64. Invocation command line was
|
| 1382 | |
|
| 1383 | |
$ $0 $@
|
| 1384 | |
|
| 1385 | |
@@ -1454,8 +1401,8 @@
|
| 1386 | |
do
|
| 1387 | |
IFS=$as_save_IFS
|
| 1388 | |
test -z "$as_dir" && as_dir=.
|
| 1389 | |
- $as_echo "PATH: $as_dir"
|
| 1390 | |
-done
|
| 1391 | |
+ $as_echo "PATH: $as_dir"
|
| 1392 | |
+ done
|
| 1393 | |
IFS=$as_save_IFS
|
| 1394 | |
|
| 1395 | |
} >&5
|
| 1396 | |
@@ -1492,9 +1439,9 @@
|
| 1397 | |
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
| 1398 | |
esac
|
| 1399 | |
case $ac_pass in
|
| 1400 | |
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
|
| 1401 | |
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
|
| 1402 | |
2)
|
| 1403 | |
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
|
| 1404 | |
+ as_fn_append ac_configure_args1 " '$ac_arg'"
|
| 1405 | |
if test $ac_must_keep_next = true; then
|
| 1406 | |
ac_must_keep_next=false # Got value, back to normal.
|
| 1407 | |
else
|
| 1408 | |
@@ -1510,13 +1457,13 @@
|
| 1409 | |
-* ) ac_must_keep_next=true ;;
|
| 1410 | |
esac
|
| 1411 | |
fi
|
| 1412 | |
- ac_configure_args="$ac_configure_args '$ac_arg'"
|
| 1413 | |
+ as_fn_append ac_configure_args " '$ac_arg'"
|
| 1414 | |
;;
|
| 1415 | |
esac
|
| 1416 | |
done
|
| 1417 | |
done
|
| 1418 | |
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
|
| 1419 | |
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
|
| 1420 | |
+{ ac_configure_args0=; unset ac_configure_args0;}
|
| 1421 | |
+{ ac_configure_args1=; unset ac_configure_args1;}
|
| 1422 | |
|
| 1423 | |
# When interrupted or exit'd, cleanup temporary files, and complete
|
| 1424 | |
# config.log. We remove comments because anyway the quotes in there
|
| 1425 | |
@@ -1541,13 +1488,13 @@
|
| 1426 | |
case $ac_val in #(
|
| 1427 | |
*${as_nl}*)
|
| 1428 | |
case $ac_var in #(
|
| 1429 | |
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
|
| 1430 | |
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
|
| 1431 | |
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
| 1432 | |
esac
|
| 1433 | |
case $ac_var in #(
|
| 1434 | |
_ | IFS | as_nl) ;; #(
|
| 1435 | |
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
| 1436 | |
- *) $as_unset $ac_var ;;
|
| 1437 | |
+ *) { eval $ac_var=; unset $ac_var;} ;;
|
| 1438 | |
esac ;;
|
| 1439 | |
esac
|
| 1440 | |
done
|
| 1441 | |
@@ -1619,39 +1566,41 @@
|
| 1442 | |
exit $exit_status
|
| 1443 | |
' 0
|
| 1444 | |
for ac_signal in 1 2 13 15; do
|
| 1445 | |
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
|
| 1446 | |
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
|
| 1447 | |
done
|
| 1448 | |
ac_signal=0
|
| 1449 | |
|
| 1450 | |
# confdefs.h avoids OS command line length limits that DEFS can exceed.
|
| 1451 | |
rm -f -r conftest* confdefs.h
|
| 1452 | |
|
| 1453 | |
+$as_echo "/* confdefs.h */" > confdefs.h
|
| 1454 | |
+
|
| 1455 | |
# Predefined preprocessor variables.
|
| 1456 | |
|
| 1457 | |
cat >>confdefs.h <<_ACEOF
|
| 1458 | |
#define PACKAGE_NAME "$PACKAGE_NAME"
|
| 1459 | |
_ACEOF
|
| 1460 | |
|
| 1461 | |
-
|
| 1462 | |
cat >>confdefs.h <<_ACEOF
|
| 1463 | |
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
|
| 1464 | |
_ACEOF
|
| 1465 | |
|
| 1466 | |
-
|
| 1467 | |
cat >>confdefs.h <<_ACEOF
|
| 1468 | |
#define PACKAGE_VERSION "$PACKAGE_VERSION"
|
| 1469 | |
_ACEOF
|
| 1470 | |
|
| 1471 | |
-
|
| 1472 | |
cat >>confdefs.h <<_ACEOF
|
| 1473 | |
#define PACKAGE_STRING "$PACKAGE_STRING"
|
| 1474 | |
_ACEOF
|
| 1475 | |
|
| 1476 | |
-
|
| 1477 | |
cat >>confdefs.h <<_ACEOF
|
| 1478 | |
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
|
| 1479 | |
_ACEOF
|
| 1480 | |
|
| 1481 | |
+cat >>confdefs.h <<_ACEOF
|
| 1482 | |
+#define PACKAGE_URL "$PACKAGE_URL"
|
| 1483 | |
+_ACEOF
|
| 1484 | |
+
|
| 1485 | |
|
| 1486 | |
# Let the site file select an alternate cache file if it wants to.
|
| 1487 | |
# Prefer an explicitly selected file to automatically selected ones.
|
| 1488 | |
@@ -1670,7 +1619,7 @@
|
| 1489 | |
do
|
| 1490 | |
test "x$ac_site_file" = xNONE && continue
|
| 1491 | |
if test -r "$ac_site_file"; then
|
| 1492 | |
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
|
| 1493 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
|
| 1494 | |
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
|
| 1495 | |
sed 's/^/| /' "$ac_site_file" >&5
|
| 1496 | |
. "$ac_site_file"
|
| 1497 | |
@@ -1681,7 +1630,7 @@
|
| 1498 | |
# Some versions of bash will fail to source /dev/null (special
|
| 1499 | |
# files actually), so we avoid doing that.
|
| 1500 | |
if test -f "$cache_file"; then
|
| 1501 | |
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
|
| 1502 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
|
| 1503 | |
$as_echo "$as_me: loading cache $cache_file" >&6;}
|
| 1504 | |
case $cache_file in
|
| 1505 | |
[\\/]* | ?:[\\/]* ) . "$cache_file";;
|
| 1506 | |
@@ -1689,7 +1638,7 @@
|
| 1507 | |
esac
|
| 1508 | |
fi
|
| 1509 | |
else
|
| 1510 | |
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
|
| 1511 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
|
| 1512 | |
$as_echo "$as_me: creating cache $cache_file" >&6;}
|
| 1513 | |
>$cache_file
|
| 1514 | |
fi
|
| 1515 | |
@@ -1704,11 +1653,11 @@
|
| 1516 | |
eval ac_new_val=\$ac_env_${ac_var}_value
|
| 1517 | |
case $ac_old_set,$ac_new_set in
|
| 1518 | |
set,)
|
| 1519 | |
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
| 1520 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
| 1521 | |
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
|
| 1522 | |
ac_cache_corrupted=: ;;
|
| 1523 | |
,set)
|
| 1524 | |
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
|
| 1525 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
|
| 1526 | |
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
|
| 1527 | |
ac_cache_corrupted=: ;;
|
| 1528 | |
,);;
|
| 1529 | |
@@ -1718,17 +1667,17 @@
|
| 1530 | |
ac_old_val_w=`echo x $ac_old_val`
|
| 1531 | |
ac_new_val_w=`echo x $ac_new_val`
|
| 1532 | |
if test "$ac_old_val_w" != "$ac_new_val_w"; then
|
| 1533 | |
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
|
| 1534 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
|
| 1535 | |
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
|
| 1536 | |
ac_cache_corrupted=:
|
| 1537 | |
else
|
| 1538 | |
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
|
| 1539 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
|
| 1540 | |
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
|
| 1541 | |
eval $ac_var=\$ac_old_val
|
| 1542 | |
fi
|
| 1543 | |
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
|
| 1544 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
|
| 1545 | |
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
|
| 1546 | |
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
|
| 1547 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
|
| 1548 | |
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
|
| 1549 | |
fi;;
|
| 1550 | |
esac
|
| 1551 | |
@@ -1740,43 +1689,20 @@
|
| 1552 | |
esac
|
| 1553 | |
case " $ac_configure_args " in
|
| 1554 | |
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
|
| 1555 | |
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
|
| 1556 | |
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
|
| 1557 | |
esac
|
| 1558 | |
fi
|
| 1559 | |
done
|
| 1560 | |
if $ac_cache_corrupted; then
|
| 1561 | |
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
| 1562 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
| 1563 | |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
| 1564 | |
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
|
| 1565 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
|
| 1566 | |
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
| 1567 | |
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
|
| 1568 | |
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
|
| 1569 | |
- { (exit 1); exit 1; }; }
|
| 1570 | |
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
| 1571 | |
fi
|
| 1572 | |
-
|
| 1573 | |
-
|
| 1574 | |
-
|
| 1575 | |
-
|
| 1576 | |
-
|
| 1577 | |
-
|
| 1578 | |
-
|
| 1579 | |
-
|
| 1580 | |
-
|
| 1581 | |
-
|
| 1582 | |
-
|
| 1583 | |
-
|
| 1584 | |
-
|
| 1585 | |
-
|
| 1586 | |
-
|
| 1587 | |
-
|
| 1588 | |
-
|
| 1589 | |
-
|
| 1590 | |
-
|
| 1591 | |
-
|
| 1592 | |
-
|
| 1593 | |
-
|
| 1594 | |
-
|
| 1595 | |
-
|
| 1596 | |
+## -------------------- ##
|
| 1597 | |
+## Main body of script. ##
|
| 1598 | |
+## -------------------- ##
|
| 1599 | |
|
| 1600 | |
ac_ext=c
|
| 1601 | |
ac_cpp='$CPP $CPPFLAGS'
|
| 1602 | |
@@ -1785,28 +1711,20 @@
|
| 1603 | |
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
| 1604 | |
|
| 1605 | |
|
| 1606 | |
-am__api_version='1.10'
|
| 1607 | |
+am__api_version='1.11'
|
| 1608 | |
|
| 1609 | |
ac_aux_dir=
|
| 1610 | |
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
| 1611 | |
- if test -f "$ac_dir/install-sh"; then
|
| 1612 | |
- ac_aux_dir=$ac_dir
|
| 1613 | |
- ac_install_sh="$ac_aux_dir/install-sh -c"
|
| 1614 | |
- break
|
| 1615 | |
- elif test -f "$ac_dir/install.sh"; then
|
| 1616 | |
- ac_aux_dir=$ac_dir
|
| 1617 | |
- ac_install_sh="$ac_aux_dir/install.sh -c"
|
| 1618 | |
- break
|
| 1619 | |
- elif test -f "$ac_dir/shtool"; then
|
| 1620 | |
- ac_aux_dir=$ac_dir
|
| 1621 | |
- ac_install_sh="$ac_aux_dir/shtool install -c"
|
| 1622 | |
- break
|
| 1623 | |
- fi
|
| 1624 | |
+ for ac_t in install-sh install.sh shtool; do
|
| 1625 | |
+ if test -f "$ac_dir/$ac_t"; then
|
| 1626 | |
+ ac_aux_dir=$ac_dir
|
| 1627 | |
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
|
| 1628 | |
+ break 2
|
| 1629 | |
+ fi
|
| 1630 | |
+ done
|
| 1631 | |
done
|
| 1632 | |
if test -z "$ac_aux_dir"; then
|
| 1633 | |
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
|
| 1634 | |
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
|
| 1635 | |
- { (exit 1); exit 1; }; }
|
| 1636 | |
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
|
| 1637 | |
fi
|
| 1638 | |
|
| 1639 | |
# These three variables are undocumented and unsupported,
|
| 1640 | |
@@ -1832,10 +1750,10 @@
|
| 1641 | |
# OS/2's system install, which has a completely different semantic
|
| 1642 | |
# ./install, which can be erroneously created by make from ./install.sh.
|
| 1643 | |
# Reject install programs that cannot install multiple files.
|
| 1644 | |
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
| 1645 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
|
| 1646 | |
$as_echo_n "checking for a BSD-compatible install... " >&6; }
|
| 1647 | |
if test -z "$INSTALL"; then
|
| 1648 | |
-if test "${ac_cv_path_install+set}" = set; then
|
| 1649 | |
+if test "${ac_cv_path_install+set}" = set; then :
|
| 1650 | |
$as_echo_n "(cached) " >&6
|
| 1651 | |
else
|
| 1652 | |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 1653 | |
@@ -1843,11 +1761,11 @@
|
| 1654 | |
do
|
| 1655 | |
IFS=$as_save_IFS
|
| 1656 | |
test -z "$as_dir" && as_dir=.
|
| 1657 | |
- # Account for people who put trailing slashes in PATH elements.
|
| 1658 | |
-case $as_dir/ in
|
| 1659 | |
- ./ | .// | /cC/* | \
|
| 1660 | |
+ # Account for people who put trailing slashes in PATH elements.
|
| 1661 | |
+case $as_dir/ in #((
|
| 1662 | |
+ ./ | .// | /[cC]/* | \
|
| 1663 | |
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
|
| 1664 | |
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
|
| 1665 | |
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
|
| 1666 | |
/usr/ucb/* ) ;;
|
| 1667 | |
*)
|
| 1668 | |
# OSF1 and SCO ODT 3.0 have their own names for install.
|
| 1669 | |
@@ -1884,7 +1802,7 @@
|
| 1670 | |
;;
|
| 1671 | |
esac
|
| 1672 | |
|
| 1673 | |
-done
|
| 1674 | |
+ done
|
| 1675 | |
IFS=$as_save_IFS
|
| 1676 | |
|
| 1677 | |
rm -rf conftest.one conftest.two conftest.dir
|
| 1678 | |
@@ -1900,7 +1818,7 @@
|
| 1679 | |
INSTALL=$ac_install_sh
|
| 1680 | |
fi
|
| 1681 | |
fi
|
| 1682 | |
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
|
| 1683 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
|
| 1684 | |
$as_echo "$INSTALL" >&6; }
|
| 1685 | |
|
| 1686 | |
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
| 1687 | |
@@ -1911,21 +1829,34 @@
|
| 1688 | |
|
| 1689 | |
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
| 1690 | |
|
| 1691 | |
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
|
| 1692 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
|
| 1693 | |
$as_echo_n "checking whether build environment is sane... " >&6; }
|
| 1694 | |
# Just in case
|
| 1695 | |
sleep 1
|
| 1696 | |
echo timestamp > conftest.file
|
| 1697 | |
+# Reject unsafe characters in $srcdir or the absolute working directory
|
| 1698 | |
+# name. Accept space and tab only in the latter.
|
| 1699 | |
+am_lf='
|
| 1700 | |
+'
|
| 1701 | |
+case `pwd` in
|
| 1702 | |
+ *[\\\"\#\$\&\'\`$am_lf]*)
|
| 1703 | |
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
|
| 1704 | |
+esac
|
| 1705 | |
+case $srcdir in
|
| 1706 | |
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
|
| 1707 | |
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
|
| 1708 | |
+esac
|
| 1709 | |
+
|
| 1710 | |
# Do `set' in a subshell so we don't clobber the current shell's
|
| 1711 | |
# arguments. Must try -L first in case configure is actually a
|
| 1712 | |
# symlink; some systems play weird games with the mod time of symlinks
|
| 1713 | |
# (eg FreeBSD returns the mod time of the symlink's containing
|
| 1714 | |
# directory).
|
| 1715 | |
if (
|
| 1716 | |
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
|
| 1717 | |
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
|
| 1718 | |
if test "$*" = "X"; then
|
| 1719 | |
# -L didn't work.
|
| 1720 | |
- set X `ls -t $srcdir/configure conftest.file`
|
| 1721 | |
+ set X `ls -t "$srcdir/configure" conftest.file`
|
| 1722 | |
fi
|
| 1723 | |
rm -f conftest.file
|
| 1724 | |
if test "$*" != "X $srcdir/configure conftest.file" \
|
| 1725 | |
@@ -1935,11 +1866,8 @@
|
| 1726 | |
# if, for instance, CONFIG_SHELL is bash and it inherits a
|
| 1727 | |
# broken ls alias from the environment. This has actually
|
| 1728 | |
# happened. Such a system could not be considered "sane".
|
| 1729 | |
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
|
| 1730 | |
-alias in your environment" >&5
|
| 1731 | |
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
|
| 1732 | |
-alias in your environment" >&2;}
|
| 1733 | |
- { (exit 1); exit 1; }; }
|
| 1734 | |
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
|
| 1735 | |
+alias in your environment" "$LINENO" 5
|
| 1736 | |
fi
|
| 1737 | |
|
| 1738 | |
test "$2" = conftest.file
|
| 1739 | |
@@ -1948,13 +1876,10 @@
|
| 1740 | |
# Ok.
|
| 1741 | |
:
|
| 1742 | |
else
|
| 1743 | |
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
|
| 1744 | |
-Check your system clock" >&5
|
| 1745 | |
-$as_echo "$as_me: error: newly created file is older than distributed files!
|
| 1746 | |
-Check your system clock" >&2;}
|
| 1747 | |
- { (exit 1); exit 1; }; }
|
| 1748 | |
+ as_fn_error "newly created file is older than distributed files!
|
| 1749 | |
+Check your system clock" "$LINENO" 5
|
| 1750 | |
fi
|
| 1751 | |
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
| 1752 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| 1753 | |
$as_echo "yes" >&6; }
|
| 1754 | |
test "$program_prefix" != NONE &&
|
| 1755 | |
program_transform_name="s&^&$program_prefix&;$program_transform_name"
|
| 1756 | |
@@ -1969,20 +1894,136 @@
|
| 1757 | |
# expand $ac_aux_dir to an absolute path
|
| 1758 | |
am_aux_dir=`cd $ac_aux_dir && pwd`
|
| 1759 | |
|
| 1760 | |
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
| 1761 | |
+if test x"${MISSING+set}" != xset; then
|
| 1762 | |
+ case $am_aux_dir in
|
| 1763 | |
+ *\ * | *\ *)
|
| 1764 | |
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
|
| 1765 | |
+ *)
|
| 1766 | |
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
|
| 1767 | |
+ esac
|
| 1768 | |
+fi
|
| 1769 | |
# Use eval to expand $SHELL
|
| 1770 | |
if eval "$MISSING --run true"; then
|
| 1771 | |
am_missing_run="$MISSING --run "
|
| 1772 | |
else
|
| 1773 | |
am_missing_run=
|
| 1774 | |
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
|
| 1775 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
|
| 1776 | |
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
|
| 1777 | |
fi
|
| 1778 | |
|
| 1779 | |
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
|
| 1780 | |
+if test x"${install_sh}" != xset; then
|
| 1781 | |
+ case $am_aux_dir in
|
| 1782 | |
+ *\ * | *\ *)
|
| 1783 | |
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
| 1784 | |
+ *)
|
| 1785 | |
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
|
| 1786 | |
+ esac
|
| 1787 | |
+fi
|
| 1788 | |
+
|
| 1789 | |
+# Installed binaries are usually stripped using `strip' when the user
|
| 1790 | |
+# run `make install-strip'. However `strip' might not be the right
|
| 1791 | |
+# tool to use in cross-compilation environments, therefore Automake
|
| 1792 | |
+# will honor the `STRIP' environment variable to overrule this program.
|
| 1793 | |
+if test "$cross_compiling" != no; then
|
| 1794 | |
+ if test -n "$ac_tool_prefix"; then
|
| 1795 | |
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
| 1796 | |
+set dummy ${ac_tool_prefix}strip; ac_word=$2
|
| 1797 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| 1798 | |
+$as_echo_n "checking for $ac_word... " >&6; }
|
| 1799 | |
+if test "${ac_cv_prog_STRIP+set}" = set; then :
|
| 1800 | |
+ $as_echo_n "(cached) " >&6
|
| 1801 | |
+else
|
| 1802 | |
+ if test -n "$STRIP"; then
|
| 1803 | |
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
|
| 1804 | |
+else
|
| 1805 | |
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 1806 | |
+for as_dir in $PATH
|
| 1807 | |
+do
|
| 1808 | |
+ IFS=$as_save_IFS
|
| 1809 | |
+ test -z "$as_dir" && as_dir=.
|
| 1810 | |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
| 1811 | |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| 1812 | |
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
|
| 1813 | |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 1814 | |
+ break 2
|
| 1815 | |
+ fi
|
| 1816 | |
+done
|
| 1817 | |
+ done
|
| 1818 | |
+IFS=$as_save_IFS
|
| 1819 | |
+
|
| 1820 | |
+fi
|
| 1821 | |
+fi
|
| 1822 | |
+STRIP=$ac_cv_prog_STRIP
|
| 1823 | |
+if test -n "$STRIP"; then
|
| 1824 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
|
| 1825 | |
+$as_echo "$STRIP" >&6; }
|
| 1826 | |
+else
|
| 1827 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| 1828 | |
+$as_echo "no" >&6; }
|
| 1829 | |
+fi
|
| 1830 | |
+
|
| 1831 | |
+
|
| 1832 | |
+fi
|
| 1833 | |
+if test -z "$ac_cv_prog_STRIP"; then
|
| 1834 | |
+ ac_ct_STRIP=$STRIP
|
| 1835 | |
+ # Extract the first word of "strip", so it can be a program name with args.
|
| 1836 | |
+set dummy strip; ac_word=$2
|
| 1837 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| 1838 | |
+$as_echo_n "checking for $ac_word... " >&6; }
|
| 1839 | |
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
|
| 1840 | |
+ $as_echo_n "(cached) " >&6
|
| 1841 | |
+else
|
| 1842 | |
+ if test -n "$ac_ct_STRIP"; then
|
| 1843 | |
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
|
| 1844 | |
+else
|
| 1845 | |
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 1846 | |
+for as_dir in $PATH
|
| 1847 | |
+do
|
| 1848 | |
+ IFS=$as_save_IFS
|
| 1849 | |
+ test -z "$as_dir" && as_dir=.
|
| 1850 | |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
| 1851 | |
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| 1852 | |
+ ac_cv_prog_ac_ct_STRIP="strip"
|
| 1853 | |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 1854 | |
+ break 2
|
| 1855 | |
+ fi
|
| 1856 | |
+done
|
| 1857 | |
+ done
|
| 1858 | |
+IFS=$as_save_IFS
|
| 1859 | |
+
|
| 1860 | |
+fi
|
| 1861 | |
+fi
|
| 1862 | |
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
|
| 1863 | |
+if test -n "$ac_ct_STRIP"; then
|
| 1864 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
|
| 1865 | |
+$as_echo "$ac_ct_STRIP" >&6; }
|
| 1866 | |
+else
|
| 1867 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| 1868 | |
+$as_echo "no" >&6; }
|
| 1869 | |
+fi
|
| 1870 | |
+
|
| 1871 | |
+ if test "x$ac_ct_STRIP" = x; then
|
| 1872 | |
+ STRIP=":"
|
| 1873 | |
+ else
|
| 1874 | |
+ case $cross_compiling:$ac_tool_warned in
|
| 1875 | |
+yes:)
|
| 1876 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
| 1877 | |
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
| 1878 | |
+ac_tool_warned=yes ;;
|
| 1879 | |
+esac
|
| 1880 | |
+ STRIP=$ac_ct_STRIP
|
| 1881 | |
+ fi
|
| 1882 | |
+else
|
| 1883 | |
+ STRIP="$ac_cv_prog_STRIP"
|
| 1884 | |
+fi
|
| 1885 | |
+
|
| 1886 | |
+fi
|
| 1887 | |
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
| 1888 | |
+
|
| 1889 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
|
| 1890 | |
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
|
| 1891 | |
if test -z "$MKDIR_P"; then
|
| 1892 | |
- if test "${ac_cv_path_mkdir+set}" = set; then
|
| 1893 | |
+ if test "${ac_cv_path_mkdir+set}" = set; then :
|
| 1894 | |
$as_echo_n "(cached) " >&6
|
| 1895 | |
else
|
| 1896 | |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 1897 | |
@@ -1990,7 +2031,7 @@
|
| 1898 | |
do
|
| 1899 | |
IFS=$as_save_IFS
|
| 1900 | |
test -z "$as_dir" && as_dir=.
|
| 1901 | |
- for ac_prog in mkdir gmkdir; do
|
| 1902 | |
+ for ac_prog in mkdir gmkdir; do
|
| 1903 | |
for ac_exec_ext in '' $ac_executable_extensions; do
|
| 1904 | |
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
|
| 1905 | |
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
|
| 1906 | |
@@ -2002,7 +2043,7 @@
|
| 1907 | |
esac
|
| 1908 | |
done
|
| 1909 | |
done
|
| 1910 | |
-done
|
| 1911 | |
+ done
|
| 1912 | |
IFS=$as_save_IFS
|
| 1913 | |
|
| 1914 | |
fi
|
| 1915 | |
@@ -2018,7 +2059,7 @@
|
| 1916 | |
MKDIR_P="$ac_install_sh -d"
|
| 1917 | |
fi
|
| 1918 | |
fi
|
| 1919 | |
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
|
| 1920 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
|
| 1921 | |
$as_echo "$MKDIR_P" >&6; }
|
| 1922 | |
|
| 1923 | |
mkdir_p="$MKDIR_P"
|
| 1924 | |
@@ -2031,9 +2072,9 @@
|
| 1925 | |
do
|
| 1926 | |
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
| 1927 | |
set dummy $ac_prog; ac_word=$2
|
| 1928 | |
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| 1929 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| 1930 | |
$as_echo_n "checking for $ac_word... " >&6; }
|
| 1931 | |
-if test "${ac_cv_prog_AWK+set}" = set; then
|
| 1932 | |
+if test "${ac_cv_prog_AWK+set}" = set; then :
|
| 1933 | |
$as_echo_n "(cached) " >&6
|
| 1934 | |
else
|
| 1935 | |
if test -n "$AWK"; then
|
| 1936 | |
@@ -2044,24 +2085,24 @@
|
| 1937 | |
do
|
| 1938 | |
IFS=$as_save_IFS
|
| 1939 | |
test -z "$as_dir" && as_dir=.
|
| 1940 | |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
| 1941 | |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
| 1942 | |
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| 1943 | |
ac_cv_prog_AWK="$ac_prog"
|
| 1944 | |
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 1945 | |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 1946 | |
break 2
|
| 1947 | |
fi
|
| 1948 | |
done
|
| 1949 | |
-done
|
| 1950 | |
+ done
|
| 1951 | |
IFS=$as_save_IFS
|
| 1952 | |
|
| 1953 | |
fi
|
| 1954 | |
fi
|
| 1955 | |
AWK=$ac_cv_prog_AWK
|
| 1956 | |
if test -n "$AWK"; then
|
| 1957 | |
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
|
| 1958 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
|
| 1959 | |
$as_echo "$AWK" >&6; }
|
| 1960 | |
else
|
| 1961 | |
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
| 1962 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| 1963 | |
$as_echo "no" >&6; }
|
| 1964 | |
fi
|
| 1965 | |
|
| 1966 | |
@@ -2069,11 +2110,11 @@
|
| 1967 | |
test -n "$AWK" && break
|
| 1968 | |
done
|
| 1969 | |
|
| 1970 | |
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
| 1971 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
| 1972 | |
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
| 1973 | |
set x ${MAKE-make}
|
| 1974 | |
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
| 1975 | |
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
|
| 1976 | |
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
|
| 1977 | |
$as_echo_n "(cached) " >&6
|
| 1978 | |
else
|
| 1979 | |
cat >conftest.make <<\_ACEOF
|
| 1980 | |
@@ -2091,11 +2132,11 @@
|
| 1981 | |
rm -f conftest.make
|
| 1982 | |
fi
|
| 1983 | |
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
|
| 1984 | |
- { $as_echo "$as_me:$LINENO: result: yes" >&5
|
| 1985 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| 1986 | |
$as_echo "yes" >&6; }
|
| 1987 | |
SET_MAKE=
|
| 1988 | |
else
|
| 1989 | |
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
| 1990 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| 1991 | |
$as_echo "no" >&6; }
|
| 1992 | |
SET_MAKE="MAKE=${MAKE-make}"
|
| 1993 | |
fi
|
| 1994 | |
@@ -2112,156 +2153,52 @@
|
| 1995 | |
if test "`cd $srcdir && pwd`" != "`pwd`"; then
|
| 1996 | |
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
|
| 1997 | |
# is not polluted with repeated "-I."
|
| 1998 | |
- am__isrc=' -I$(srcdir)'
|
| 1999 | |
- # test to see if srcdir already configured
|
| 2000 | |
- if test -f $srcdir/config.status; then
|
| 2001 | |
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
|
| 2002 | |
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
|
| 2003 | |
- { (exit 1); exit 1; }; }
|
| 2004 | |
- fi
|
| 2005 | |
-fi
|
| 2006 | |
-
|
| 2007 | |
-# test whether we have cygpath
|
| 2008 | |
-if test -z "$CYGPATH_W"; then
|
| 2009 | |
- if (cygpath --version) >/dev/null 2>/dev/null; then
|
| 2010 | |
- CYGPATH_W='cygpath -w'
|
| 2011 | |
- else
|
| 2012 | |
- CYGPATH_W=echo
|
| 2013 | |
- fi
|
| 2014 | |
-fi
|
| 2015 | |
-
|
| 2016 | |
-
|
| 2017 | |
-# Define the identity of the package.
|
| 2018 | |
- PACKAGE='gnome-user-docs'
|
| 2019 | |
- VERSION='2.28.0'
|
| 2020 | |
-
|
| 2021 | |
-
|
| 2022 | |
-cat >>confdefs.h <<_ACEOF
|
| 2023 | |
-#define PACKAGE "$PACKAGE"
|
| 2024 | |
-_ACEOF
|
| 2025 | |
-
|
| 2026 | |
-
|
| 2027 | |
-cat >>confdefs.h <<_ACEOF
|
| 2028 | |
-#define VERSION "$VERSION"
|
| 2029 | |
-_ACEOF
|
| 2030 | |
-
|
| 2031 | |
-# Some tools Automake needs.
|
| 2032 | |
-
|
| 2033 | |
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
|
| 2034 | |
-
|
| 2035 | |
-
|
| 2036 | |
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
|
| 2037 | |
-
|
| 2038 | |
-
|
| 2039 | |
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
|
| 2040 | |
-
|
| 2041 | |
-
|
| 2042 | |
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
|
| 2043 | |
-
|
| 2044 | |
-
|
| 2045 | |
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
|
| 2046 | |
-
|
| 2047 | |
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
|
| 2048 | |
-
|
| 2049 | |
-# Installed binaries are usually stripped using `strip' when the user
|
| 2050 | |
-# run `make install-strip'. However `strip' might not be the right
|
| 2051 | |
-# tool to use in cross-compilation environments, therefore Automake
|
| 2052 | |
-# will honor the `STRIP' environment variable to overrule this program.
|
| 2053 | |
-if test "$cross_compiling" != no; then
|
| 2054 | |
- if test -n "$ac_tool_prefix"; then
|
| 2055 | |
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
| 2056 | |
-set dummy ${ac_tool_prefix}strip; ac_word=$2
|
| 2057 | |
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| 2058 | |
-$as_echo_n "checking for $ac_word... " >&6; }
|
| 2059 | |
-if test "${ac_cv_prog_STRIP+set}" = set; then
|
| 2060 | |
- $as_echo_n "(cached) " >&6
|
| 2061 | |
-else
|
| 2062 | |
- if test -n "$STRIP"; then
|
| 2063 | |
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
|
| 2064 | |
-else
|
| 2065 | |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 2066 | |
-for as_dir in $PATH
|
| 2067 | |
-do
|
| 2068 | |
- IFS=$as_save_IFS
|
| 2069 | |
- test -z "$as_dir" && as_dir=.
|
| 2070 | |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
| 2071 | |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| 2072 | |
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
|
| 2073 | |
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 2074 | |
- break 2
|
| 2075 | |
- fi
|
| 2076 | |
-done
|
| 2077 | |
-done
|
| 2078 | |
-IFS=$as_save_IFS
|
| 2079 | |
-
|
| 2080 | |
-fi
|
| 2081 | |
-fi
|
| 2082 | |
-STRIP=$ac_cv_prog_STRIP
|
| 2083 | |
-if test -n "$STRIP"; then
|
| 2084 | |
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
|
| 2085 | |
-$as_echo "$STRIP" >&6; }
|
| 2086 | |
-else
|
| 2087 | |
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
| 2088 | |
-$as_echo "no" >&6; }
|
| 2089 | |
-fi
|
| 2090 | |
-
|
| 2091 | |
-
|
| 2092 | |
-fi
|
| 2093 | |
-if test -z "$ac_cv_prog_STRIP"; then
|
| 2094 | |
- ac_ct_STRIP=$STRIP
|
| 2095 | |
- # Extract the first word of "strip", so it can be a program name with args.
|
| 2096 | |
-set dummy strip; ac_word=$2
|
| 2097 | |
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| 2098 | |
-$as_echo_n "checking for $ac_word... " >&6; }
|
| 2099 | |
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
|
| 2100 | |
- $as_echo_n "(cached) " >&6
|
| 2101 | |
-else
|
| 2102 | |
- if test -n "$ac_ct_STRIP"; then
|
| 2103 | |
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
|
| 2104 | |
-else
|
| 2105 | |
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 2106 | |
-for as_dir in $PATH
|
| 2107 | |
-do
|
| 2108 | |
- IFS=$as_save_IFS
|
| 2109 | |
- test -z "$as_dir" && as_dir=.
|
| 2110 | |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
| 2111 | |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| 2112 | |
- ac_cv_prog_ac_ct_STRIP="strip"
|
| 2113 | |
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 2114 | |
- break 2
|
| 2115 | |
- fi
|
| 2116 | |
-done
|
| 2117 | |
-done
|
| 2118 | |
-IFS=$as_save_IFS
|
| 2119 | |
-
|
| 2120 | |
-fi
|
| 2121 | |
-fi
|
| 2122 | |
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
|
| 2123 | |
-if test -n "$ac_ct_STRIP"; then
|
| 2124 | |
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
| 2125 | |
-$as_echo "$ac_ct_STRIP" >&6; }
|
| 2126 | |
-else
|
| 2127 | |
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
| 2128 | |
-$as_echo "no" >&6; }
|
| 2129 | |
-fi
|
| 2130 | |
-
|
| 2131 | |
- if test "x$ac_ct_STRIP" = x; then
|
| 2132 | |
- STRIP=":"
|
| 2133 | |
- else
|
| 2134 | |
- case $cross_compiling:$ac_tool_warned in
|
| 2135 | |
-yes:)
|
| 2136 | |
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
| 2137 | |
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
| 2138 | |
-ac_tool_warned=yes ;;
|
| 2139 | |
-esac
|
| 2140 | |
- STRIP=$ac_ct_STRIP
|
| 2141 | |
+ am__isrc=' -I$(srcdir)'
|
| 2142 | |
+ # test to see if srcdir already configured
|
| 2143 | |
+ if test -f $srcdir/config.status; then
|
| 2144 | |
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
|
| 2145 | |
fi
|
| 2146 | |
-else
|
| 2147 | |
- STRIP="$ac_cv_prog_STRIP"
|
| 2148 | |
fi
|
| 2149 | |
|
| 2150 | |
+# test whether we have cygpath
|
| 2151 | |
+if test -z "$CYGPATH_W"; then
|
| 2152 | |
+ if (cygpath --version) >/dev/null 2>/dev/null; then
|
| 2153 | |
+ CYGPATH_W='cygpath -w'
|
| 2154 | |
+ else
|
| 2155 | |
+ CYGPATH_W=echo
|
| 2156 | |
+ fi
|
| 2157 | |
fi
|
| 2158 | |
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
| 2159 | |
+
|
| 2160 | |
+
|
| 2161 | |
+# Define the identity of the package.
|
| 2162 | |
+ PACKAGE='gnome-user-docs'
|
| 2163 | |
+ VERSION='2.28.0'
|
| 2164 | |
+
|
| 2165 | |
+
|
| 2166 | |
+cat >>confdefs.h <<_ACEOF
|
| 2167 | |
+#define PACKAGE "$PACKAGE"
|
| 2168 | |
+_ACEOF
|
| 2169 | |
+
|
| 2170 | |
+
|
| 2171 | |
+cat >>confdefs.h <<_ACEOF
|
| 2172 | |
+#define VERSION "$VERSION"
|
| 2173 | |
+_ACEOF
|
| 2174 | |
+
|
| 2175 | |
+# Some tools Automake needs.
|
| 2176 | |
+
|
| 2177 | |
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
|
| 2178 | |
+
|
| 2179 | |
+
|
| 2180 | |
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
|
| 2181 | |
+
|
| 2182 | |
+
|
| 2183 | |
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
|
| 2184 | |
+
|
| 2185 | |
+
|
| 2186 | |
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
|
| 2187 | |
+
|
| 2188 | |
+
|
| 2189 | |
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
|
| 2190 | |
|
| 2191 | |
# We need awk for the "check" target. The system "awk" is bad on
|
| 2192 | |
# some platforms.
|
| 2193 | |
@@ -2276,14 +2213,14 @@
|
| 2194 | |
|
| 2195 | |
|
| 2196 | |
|
| 2197 | |
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
|
| 2198 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
|
| 2199 | |
$as_echo_n "checking whether ln -s works... " >&6; }
|
| 2200 | |
LN_S=$as_ln_s
|
| 2201 | |
if test "$LN_S" = "ln -s"; then
|
| 2202 | |
- { $as_echo "$as_me:$LINENO: result: yes" >&5
|
| 2203 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| 2204 | |
$as_echo "yes" >&6; }
|
| 2205 | |
else
|
| 2206 | |
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
|
| 2207 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
|
| 2208 | |
$as_echo "no, using $LN_S" >&6; }
|
| 2209 | |
fi
|
| 2210 | |
|
| 2211 | |
@@ -2293,9 +2230,9 @@
|
| 2212 | |
if test -n "$ac_tool_prefix"; then
|
| 2213 | |
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
| 2214 | |
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
|
| 2215 | |
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| 2216 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| 2217 | |
$as_echo_n "checking for $ac_word... " >&6; }
|
| 2218 | |
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
|
| 2219 | |
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
|
| 2220 | |
$as_echo_n "(cached) " >&6
|
| 2221 | |
else
|
| 2222 | |
case $PKG_CONFIG in
|
| 2223 | |
@@ -2308,14 +2245,14 @@
|
| 2224 | |
do
|
| 2225 | |
IFS=$as_save_IFS
|
| 2226 | |
test -z "$as_dir" && as_dir=.
|
| 2227 | |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
| 2228 | |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
| 2229 | |
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| 2230 | |
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
| 2231 | |
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 2232 | |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 2233 | |
break 2
|
| 2234 | |
fi
|
| 2235 | |
done
|
| 2236 | |
-done
|
| 2237 | |
+ done
|
| 2238 | |
IFS=$as_save_IFS
|
| 2239 | |
|
| 2240 | |
;;
|
| 2241 | |
@@ -2323,10 +2260,10 @@
|
| 2242 | |
fi
|
| 2243 | |
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
| 2244 | |
if test -n "$PKG_CONFIG"; then
|
| 2245 | |
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
| 2246 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
|
| 2247 | |
$as_echo "$PKG_CONFIG" >&6; }
|
| 2248 | |
else
|
| 2249 | |
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
| 2250 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| 2251 | |
$as_echo "no" >&6; }
|
| 2252 | |
fi
|
| 2253 | |
|
| 2254 | |
@@ -2336,9 +2273,9 @@
|
| 2255 | |
ac_pt_PKG_CONFIG=$PKG_CONFIG
|
| 2256 | |
# Extract the first word of "pkg-config", so it can be a program name with args.
|
| 2257 | |
set dummy pkg-config; ac_word=$2
|
| 2258 | |
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
| 2259 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
| 2260 | |
$as_echo_n "checking for $ac_word... " >&6; }
|
| 2261 | |
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
|
| 2262 | |
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
|
| 2263 | |
$as_echo_n "(cached) " >&6
|
| 2264 | |
else
|
| 2265 | |
case $ac_pt_PKG_CONFIG in
|
| 2266 | |
@@ -2351,14 +2288,14 @@
|
| 2267 | |
do
|
| 2268 | |
IFS=$as_save_IFS
|
| 2269 | |
test -z "$as_dir" && as_dir=.
|
| 2270 | |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
| 2271 | |
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
| 2272 | |
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| 2273 | |
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
| 2274 | |
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 2275 | |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| 2276 | |
break 2
|
| 2277 | |
fi
|
| 2278 | |
done
|
| 2279 | |
-done
|
| 2280 | |
+ done
|
| 2281 | |
IFS=$as_save_IFS
|
| 2282 | |
|
| 2283 | |
;;
|
| 2284 | |
@@ -2366,10 +2303,10 @@
|
| 2285 | |
fi
|
| 2286 | |
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
|
| 2287 | |
if test -n "$ac_pt_PKG_CONFIG"; then
|
| 2288 | |
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
|
| 2289 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
|
| 2290 | |
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
|
| 2291 | |
else
|
| 2292 | |
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
| 2293 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| 2294 | |
$as_echo "no" >&6; }
|
| 2295 | |
fi
|
| 2296 | |
|
| 2297 | |
@@ -2378,7 +2315,7 @@
|
| 2298 | |
else
|
| 2299 | |
case $cross_compiling:$ac_tool_warned in
|
| 2300 | |
yes:)
|
| 2301 | |
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
| 2302 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
| 2303 | |
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
| 2304 | |
ac_tool_warned=yes ;;
|
| 2305 | |
esac
|
| 2306 | |
@@ -2391,13 +2328,13 @@
|
| 2307 | |
fi
|
| 2308 | |
if test -n "$PKG_CONFIG"; then
|
| 2309 | |
_pkg_min_version=0.9.0
|
| 2310 | |
- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
|
| 2311 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
|
| 2312 | |
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
|
| 2313 | |
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
| 2314 | |
- { $as_echo "$as_me:$LINENO: result: yes" >&5
|
| 2315 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| 2316 | |
$as_echo "yes" >&6; }
|
| 2317 | |
else
|
| 2318 | |
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
| 2319 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| 2320 | |
$as_echo "no" >&6; }
|
| 2321 | |
PKG_CONFIG=""
|
| 2322 | |
fi
|
| 2323 | |
@@ -2406,35 +2343,33 @@
|
| 2324 | |
|
| 2325 | |
gdu_cv_version_required=0.3.2
|
| 2326 | |
|
| 2327 | |
-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
|
| 2328 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
|
| 2329 | |
$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
|
| 2330 | |
if test -n "$PKG_CONFIG" && \
|
| 2331 | |
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
|
| 2332 | |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
|
| 2333 | |
($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
|
| 2334 | |
ac_status=$?
|
| 2335 | |
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| 2336 | |
- (exit $ac_status); }; then
|
| 2337 | |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| 2338 | |
+ test $ac_status = 0; }; then
|
| 2339 | |
gdu_cv_have_gdu=yes
|
| 2340 | |
else
|
| 2341 | |
gdu_cv_have_gdu=no
|
| 2342 | |
fi
|
| 2343 | |
|
| 2344 | |
if test "$gdu_cv_have_gdu" = "yes"; then
|
| 2345 | |
- { $as_echo "$as_me:$LINENO: result: yes" >&5
|
| 2346 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| 2347 | |
$as_echo "yes" >&6; }
|
| 2348 | |
:
|
| 2349 | |
else
|
| 2350 | |
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
| 2351 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| 2352 | |
$as_echo "no" >&6; }
|
| 2353 | |
- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
|
| 2354 | |
-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
|
| 2355 | |
- { (exit 1); exit 1; }; }
|
| 2356 | |
+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
|
| 2357 | |
fi
|
| 2358 | |
|
| 2359 | |
|
| 2360 | |
|
| 2361 | |
# Check whether --with-help-dir was given.
|
| 2362 | |
-if test "${with_help_dir+set}" = set; then
|
| 2363 | |
+if test "${with_help_dir+set}" = set; then :
|
| 2364 | |
withval=$with_help_dir;
|
| 2365 | |
else
|
| 2366 | |
with_help_dir='${datadir}/gnome/help'
|
| 2367 | |
@@ -2445,7 +2380,7 @@
|
| 2368 | |
|
| 2369 | |
|
| 2370 | |
# Check whether --with-omf-dir was given.
|
| 2371 | |
-if test "${with_omf_dir+set}" = set; then
|
| 2372 | |
+if test "${with_omf_dir+set}" = set; then :
|
| 2373 | |
withval=$with_omf_dir;
|
| 2374 | |
else
|
| 2375 | |
with_omf_dir='${datadir}/omf'
|
| 2376 | |
@@ -2456,7 +2391,7 @@
|
| 2377 | |
|
| 2378 | |
|
| 2379 | |
# Check whether --with-help-formats was given.
|
| 2380 | |
-if test "${with_help_formats+set}" = set; then
|
| 2381 | |
+if test "${with_help_formats+set}" = set; then :
|
| 2382 | |
withval=$with_help_formats;
|
| 2383 | |
else
|
| 2384 | |
with_help_formats=''
|
| 2385 | |
@@ -2466,7 +2401,7 @@
|
| 2386 | |
|
| 2387 | |
|
| 2388 | |
# Check whether --enable-scrollkeeper was given.
|
| 2389 | |
-if test "${enable_scrollkeeper+set}" = set; then
|
| 2390 | |
+if test "${enable_scrollkeeper+set}" = set; then :
|
| 2391 | |
enableval=$enable_scrollkeeper;
|
| 2392 | |
else
|
| 2393 | |
enable_scrollkeeper=yes
|
| 2394 | |
@@ -2495,16 +2430,17 @@
|
| 2395 | |
|
| 2396 | |
|
| 2397 | |
|
| 2398 | |
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
| 2399 | |
+
|
| 2400 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
| 2401 | |
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
|
| 2402 | |
# Check whether --enable-maintainer-mode was given.
|
| 2403 | |
-if test "${enable_maintainer_mode+set}" = set; then
|
| 2404 | |
+if test "${enable_maintainer_mode+set}" = set; then :
|
| 2405 | |
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
|
| 2406 | |
else
|
| 2407 | |
USE_MAINTAINER_MODE=no
|
| 2408 | |
fi
|
| 2409 | |
|
| 2410 | |
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
|
| 2411 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
|
| 2412 | |
$as_echo "$USE_MAINTAINER_MODE" >&6; }
|
| 2413 | |
if test $USE_MAINTAINER_MODE = yes; then
|
| 2414 | |
MAINTAINER_MODE_TRUE=
|
| 2415 | |
@@ -2520,40 +2456,44 @@
|
| 2416 | |
|
| 2417 | |
|
| 2418 | |
pkg_failed=no
|
| 2419 | |
-{ $as_echo "$as_me:$LINENO: checking for GNOME2_USER_DOCS" >&5
|
| 2420 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME2_USER_DOCS" >&5
|
| 2421 | |
$as_echo_n "checking for GNOME2_USER_DOCS... " >&6; }
|
| 2422 | |
|
| 2423 | |
-if test -n "$GNOME2_USER_DOCS_CFLAGS"; then
|
| 2424 | |
- pkg_cv_GNOME2_USER_DOCS_CFLAGS="$GNOME2_USER_DOCS_CFLAGS"
|
| 2425 | |
- elif test -n "$PKG_CONFIG"; then
|
| 2426 | |
- if test -n "$PKG_CONFIG" && \
|
| 2427 | |
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" gnome-doc-utils >= 0.5.6 \"") >&5
|
| 2428 | |
+if test -n "$PKG_CONFIG"; then
|
| 2429 | |
+ if test -n "$GNOME2_USER_DOCS_CFLAGS"; then
|
| 2430 | |
+ pkg_cv_GNOME2_USER_DOCS_CFLAGS="$GNOME2_USER_DOCS_CFLAGS"
|
| 2431 | |
+ else
|
| 2432 | |
+ if test -n "$PKG_CONFIG" && \
|
| 2433 | |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gnome-doc-utils >= 0.5.6 \""; } >&5
|
| 2434 | |
($PKG_CONFIG --exists --print-errors " gnome-doc-utils >= 0.5.6 ") 2>&5
|
| 2435 | |
ac_status=$?
|
| 2436 | |
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| 2437 | |
- (exit $ac_status); }; then
|
| 2438 | |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| 2439 | |
+ test $ac_status = 0; }; then
|
| 2440 | |
pkg_cv_GNOME2_USER_DOCS_CFLAGS=`$PKG_CONFIG --cflags " gnome-doc-utils >= 0.5.6 " 2>/dev/null`
|
| 2441 | |
else
|
| 2442 | |
pkg_failed=yes
|
| 2443 | |
fi
|
| 2444 | |
- else
|
| 2445 | |
- pkg_failed=untried
|
| 2446 | |
+ fi
|
| 2447 | |
+else
|
| 2448 | |
+ pkg_failed=untried
|
| 2449 | |
fi
|
| 2450 | |
-if test -n "$GNOME2_USER_DOCS_LIBS"; then
|
| 2451 | |
- pkg_cv_GNOME2_USER_DOCS_LIBS="$GNOME2_USER_DOCS_LIBS"
|
| 2452 | |
- elif test -n "$PKG_CONFIG"; then
|
| 2453 | |
- if test -n "$PKG_CONFIG" && \
|
| 2454 | |
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" gnome-doc-utils >= 0.5.6 \"") >&5
|
| 2455 | |
+if test -n "$PKG_CONFIG"; then
|
| 2456 | |
+ if test -n "$GNOME2_USER_DOCS_LIBS"; then
|
| 2457 | |
+ pkg_cv_GNOME2_USER_DOCS_LIBS="$GNOME2_USER_DOCS_LIBS"
|
| 2458 | |
+ else
|
| 2459 | |
+ if test -n "$PKG_CONFIG" && \
|
| 2460 | |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gnome-doc-utils >= 0.5.6 \""; } >&5
|
| 2461 | |
($PKG_CONFIG --exists --print-errors " gnome-doc-utils >= 0.5.6 ") 2>&5
|
| 2462 | |
ac_status=$?
|
| 2463 | |
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| 2464 | |
- (exit $ac_status); }; then
|
| 2465 | |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| 2466 | |
+ test $ac_status = 0; }; then
|
| 2467 | |
pkg_cv_GNOME2_USER_DOCS_LIBS=`$PKG_CONFIG --libs " gnome-doc-utils >= 0.5.6 " 2>/dev/null`
|
| 2468 | |
else
|
| 2469 | |
pkg_failed=yes
|
| 2470 | |
fi
|
| 2471 | |
- else
|
| 2472 | |
- pkg_failed=untried
|
| 2473 | |
+ fi
|
| 2474 | |
+else
|
| 2475 | |
+ pkg_failed=untried
|
| 2476 | |
fi
|
| 2477 | |
|
| 2478 | |
|
| 2479 | |
@@ -2566,25 +2506,14 @@
|
| 2480 | |
_pkg_short_errors_supported=no
|
| 2481 | |
fi
|
| 2482 | |
if test $_pkg_short_errors_supported = yes; then
|
| 2483 | |
- GNOME2_USER_DOCS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gnome-doc-utils >= 0.5.6 " 2>&1`
|
| 2484 | |
+ GNOME2_USER_DOCS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " gnome-doc-utils >= 0.5.6 "`
|
| 2485 | |
else
|
| 2486 | |
- GNOME2_USER_DOCS_PKG_ERRORS=`$PKG_CONFIG --print-errors " gnome-doc-utils >= 0.5.6 " 2>&1`
|
| 2487 | |
+ GNOME2_USER_DOCS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " gnome-doc-utils >= 0.5.6 "`
|
| 2488 | |
fi
|
| 2489 | |
# Put the nasty error message in config.log where it belongs
|
| 2490 | |
echo "$GNOME2_USER_DOCS_PKG_ERRORS" >&5
|
| 2491 | |
|
| 2492 | |
- { { $as_echo "$as_me:$LINENO: error: Package requirements ( gnome-doc-utils >= 0.5.6 ) were not met:
|
| 2493 | |
-
|
| 2494 | |
-$GNOME2_USER_DOCS_PKG_ERRORS
|
| 2495 | |
-
|
| 2496 | |
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
| 2497 | |
-installed software in a non-standard prefix.
|
| 2498 | |
-
|
| 2499 | |
-Alternatively, you may set the environment variables GNOME2_USER_DOCS_CFLAGS
|
| 2500 | |
-and GNOME2_USER_DOCS_LIBS to avoid the need to call pkg-config.
|
| 2501 | |
-See the pkg-config man page for more details.
|
| 2502 | |
-" >&5
|
| 2503 | |
-$as_echo "$as_me: error: Package requirements ( gnome-doc-utils >= 0.5.6 ) were not met:
|
| 2504 | |
+ as_fn_error "Package requirements ( gnome-doc-utils >= 0.5.6 ) were not met:
|
| 2505 | |
|
| 2506 | |
$GNOME2_USER_DOCS_PKG_ERRORS
|
| 2507 | |
|
| 2508 | |
@@ -2594,22 +2523,11 @@
|
| 2509 | |
Alternatively, you may set the environment variables GNOME2_USER_DOCS_CFLAGS
|
| 2510 | |
and GNOME2_USER_DOCS_LIBS to avoid the need to call pkg-config.
|
| 2511 | |
See the pkg-config man page for more details.
|
| 2512 | |
-" >&2;}
|
| 2513 | |
- { (exit 1); exit 1; }; }
|
| 2514 | |
+" "$LINENO" 5
|
| 2515 | |
elif test $pkg_failed = untried; then
|
| 2516 | |
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
| 2517 | |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
| 2518 | |
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
| 2519 | |
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
|
| 2520 | |
-is in your PATH or set the PKG_CONFIG environment variable to the full
|
| 2521 | |
-path to pkg-config.
|
| 2522 | |
-
|
| 2523 | |
-Alternatively, you may set the environment variables GNOME2_USER_DOCS_CFLAGS
|
| 2524 | |
-and GNOME2_USER_DOCS_LIBS to avoid the need to call pkg-config.
|
| 2525 | |
-See the pkg-config man page for more details.
|
| 2526 | |
-
|
| 2527 | |
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
| 2528 | |
-See \`config.log' for more details." >&5
|
| 2529 | |
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
|
| 2530 | |
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
|
| 2531 | |
is in your PATH or set the PKG_CONFIG environment variable to the full
|
| 2532 | |
path to pkg-config.
|
| 2533 | |
|
| 2534 | |
@@ -2618,12 +2536,11 @@
|
| 2535 | |
See the pkg-config man page for more details.
|
| 2536 | |
|
| 2537 | |
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
| 2538 | |
-See \`config.log' for more details." >&2;}
|
| 2539 | |
- { (exit 1); exit 1; }; }; }
|
| 2540 | |
+See \`config.log' for more details." "$LINENO" 5; }
|
| 2541 | |
else
|
| 2542 | |
GNOME2_USER_DOCS_CFLAGS=$pkg_cv_GNOME2_USER_DOCS_CFLAGS
|
| 2543 | |
GNOME2_USER_DOCS_LIBS=$pkg_cv_GNOME2_USER_DOCS_LIBS
|
| 2544 | |
- { $as_echo "$as_me:$LINENO: result: yes" >&5
|
| 2545 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| 2546 | |
$as_echo "yes" >&6; }
|
| 2547 | |
:
|
| 2548 | |
fi
|
| 2549 | |
@@ -2657,13 +2574,13 @@
|
| 2550 | |
case $ac_val in #(
|
| 2551 | |
*${as_nl}*)
|
| 2552 | |
case $ac_var in #(
|
| 2553 | |
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
|
| 2554 | |
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
|
| 2555 | |
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
| 2556 | |
esac
|
| 2557 | |
case $ac_var in #(
|
| 2558 | |
_ | IFS | as_nl) ;; #(
|
| 2559 | |
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
| 2560 | |
- *) $as_unset $ac_var ;;
|
| 2561 | |
+ *) { eval $ac_var=; unset $ac_var;} ;;
|
| 2562 | |
esac ;;
|
| 2563 | |
esac
|
| 2564 | |
done
|
| 2565 | |
@@ -2671,8 +2588,8 @@
|
| 2566 | |
(set) 2>&1 |
|
| 2567 | |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
|
| 2568 | |
*${as_nl}ac_space=\ *)
|
| 2569 | |
- # `set' does not quote correctly, so add quotes (double-quote
|
| 2570 | |
- # substitution turns \\\\ into \\, and sed turns \\ into \).
|
| 2571 | |
+ # `set' does not quote correctly, so add quotes: double-quote
|
| 2572 | |
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
|
| 2573 | |
sed -n \
|
| 2574 | |
"s/'/'\\\\''/g;
|
| 2575 | |
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
|
| 2576 | |
@@ -2695,11 +2612,11 @@
|
| 2577 | |
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
|
| 2578 | |
if test -w "$cache_file"; then
|
| 2579 | |
test "x$cache_file" != "x/dev/null" &&
|
| 2580 | |
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
|
| 2581 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
|
| 2582 | |
$as_echo "$as_me: updating cache $cache_file" >&6;}
|
| 2583 | |
cat confcache >$cache_file
|
| 2584 | |
else
|
| 2585 | |
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
|
| 2586 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
|
| 2587 | |
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
| 2588 | |
fi
|
| 2589 | |
fi
|
| 2590 | |
@@ -2755,43 +2672,36 @@
|
| 2591 | |
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
|
| 2592 | |
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
|
| 2593 | |
# will be set to the directory where LIBOBJS objects are built.
|
| 2594 | |
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
| 2595 | |
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
|
| 2596 | |
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
| 2597 | |
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
|
| 2598 | |
done
|
| 2599 | |
LIBOBJS=$ac_libobjs
|
| 2600 | |
|
| 2601 | |
LTLIBOBJS=$ac_ltlibobjs
|
| 2602 | |
|
| 2603 | |
|
| 2604 | |
+
|
| 2605 | |
if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
|
| 2606 | |
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
|
| 2607 | |
-Usually this means the macro was only invoked conditionally." >&5
|
| 2608 | |
-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
|
| 2609 | |
-Usually this means the macro was only invoked conditionally." >&2;}
|
| 2610 | |
- { (exit 1); exit 1; }; }
|
| 2611 | |
+ as_fn_error "conditional \"ENABLE_SK\" was never defined.
|
| 2612 | |
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| 2613 | |
fi
|
| 2614 | |
if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
|
| 2615 | |
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
|
| 2616 | |
-Usually this means the macro was only invoked conditionally." >&5
|
| 2617 | |
-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
|
| 2618 | |
-Usually this means the macro was only invoked conditionally." >&2;}
|
| 2619 | |
- { (exit 1); exit 1; }; }
|
| 2620 | |
+ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
|
| 2621 | |
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| 2622 | |
fi
|
| 2623 | |
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
|
| 2624 | |
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
|
| 2625 | |
-Usually this means the macro was only invoked conditionally." >&5
|
| 2626 | |
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
|
| 2627 | |
-Usually this means the macro was only invoked conditionally." >&2;}
|
| 2628 | |
- { (exit 1); exit 1; }; }
|
| 2629 | |
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
|
| 2630 | |
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| 2631 | |
fi
|
| 2632 | |
|
| 2633 | |
: ${CONFIG_STATUS=./config.status}
|
| 2634 | |
ac_write_fail=0
|
| 2635 | |
ac_clean_files_save=$ac_clean_files
|
| 2636 | |
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
| 2637 | |
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
|
| 2638 | |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
|
| 2639 | |
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
| 2640 | |
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| 2641 | |
+as_write_fail=0
|
| 2642 | |
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
|
| 2643 | |
#! $SHELL
|
| 2644 | |
# Generated by $as_me.
|
| 2645 | |
# Run this file to recreate the current configuration.
|
| 2646 | |
@@ -2801,17 +2711,18 @@
|
| 2647 | |
debug=false
|
| 2648 | |
ac_cs_recheck=false
|
| 2649 | |
ac_cs_silent=false
|
| 2650 | |
-SHELL=\${CONFIG_SHELL-$SHELL}
|
| 2651 | |
-_ACEOF
|
| 2652 | |
|
| 2653 | |
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
| 2654 | |
-## --------------------- ##
|
| 2655 | |
-## M4sh Initialization. ##
|
| 2656 | |
-## --------------------- ##
|
| 2657 | |
+SHELL=\${CONFIG_SHELL-$SHELL}
|
| 2658 | |
+export SHELL
|
| 2659 | |
+_ASEOF
|
| 2660 | |
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
|
| 2661 | |
+## -------------------- ##
|
| 2662 | |
+## M4sh Initialization. ##
|
| 2663 | |
+## -------------------- ##
|
| 2664 | |
|
| 2665 | |
# Be more Bourne compatible
|
| 2666 | |
DUALCASE=1; export DUALCASE # for MKS sh
|
| 2667 | |
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
| 2668 | |
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
|
| 2669 | |
emulate sh
|
| 2670 | |
NULLCMD=:
|
| 2671 | |
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
| 2672 | |
@@ -2819,23 +2730,15 @@
|
| 2673 | |
alias -g '${1+"$@"}'='"$@"'
|
| 2674 | |
setopt NO_GLOB_SUBST
|
| 2675 | |
else
|
| 2676 | |
- case `(set -o) 2>/dev/null` in
|
| 2677 | |
- *posix*) set -o posix ;;
|
| 2678 | |
+ case `(set -o) 2>/dev/null` in #(
|
| 2679 | |
+ *posix*) :
|
| 2680 | |
+ set -o posix ;; #(
|
| 2681 | |
+ *) :
|
| 2682 | |
+ ;;
|
| 2683 | |
esac
|
| 2684 | |
-
|
| 2685 | |
fi
|
| 2686 | |
|
| 2687 | |
|
| 2688 | |
-
|
| 2689 | |
-
|
| 2690 | |
-# PATH needs CR
|
| 2691 | |
-# Avoid depending upon Character Ranges.
|
| 2692 | |
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
| 2693 | |
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
| 2694 | |
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
| 2695 | |
-as_cr_digits='0123456789'
|
| 2696 | |
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
| 2697 | |
-
|
| 2698 | |
as_nl='
|
| 2699 | |
'
|
| 2700 | |
export as_nl
|
| 2701 | |
@@ -2843,7 +2746,13 @@
|
| 2702 | |
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
| 2703 | |
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
|
| 2704 | |
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
|
| 2705 | |
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
| 2706 | |
+# Prefer a ksh shell builtin over an external printf program on Solaris,
|
| 2707 | |
+# but without wasting forks for bash or zsh.
|
| 2708 | |
+if test -z "$BASH_VERSION$ZSH_VERSION" \
|
| 2709 | |
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
|
| 2710 | |
+ as_echo='print -r --'
|
| 2711 | |
+ as_echo_n='print -rn --'
|
| 2712 | |
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
| 2713 | |
as_echo='printf %s\n'
|
| 2714 | |
as_echo_n='printf %s'
|
| 2715 | |
else
|
| 2716 | |
@@ -2854,7 +2763,7 @@
|
| 2717 | |
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
| 2718 | |
as_echo_n_body='eval
|
| 2719 | |
arg=$1;
|
| 2720 | |
- case $arg in
|
| 2721 | |
+ case $arg in #(
|
| 2722 | |
*"$as_nl"*)
|
| 2723 | |
expr "X$arg" : "X\\(.*\\)$as_nl";
|
| 2724 | |
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
| 2725 | |
@@ -2877,13 +2786,6 @@
|
| 2726 | |
}
|
| 2727 | |
fi
|
| 2728 | |
|
| 2729 | |
-# Support unset when possible.
|
| 2730 | |
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
| 2731 | |
- as_unset=unset
|
| 2732 | |
-else
|
| 2733 | |
- as_unset=false
|
| 2734 | |
-fi
|
| 2735 | |
-
|
| 2736 | |
|
| 2737 | |
# IFS
|
| 2738 | |
# We need space, tab and new line, in precisely that order. Quoting is
|
| 2739 | |
@@ -2893,15 +2795,15 @@
|
| 2740 | |
IFS=" "" $as_nl"
|
| 2741 | |
|
| 2742 | |
# Find who we are. Look in the path if we contain no directory separator.
|
| 2743 | |
-case $0 in
|
| 2744 | |
+case $0 in #((
|
| 2745 | |
*[\\/]* ) as_myself=$0 ;;
|
| 2746 | |
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
| 2747 | |
for as_dir in $PATH
|
| 2748 | |
do
|
| 2749 | |
IFS=$as_save_IFS
|
| 2750 | |
test -z "$as_dir" && as_dir=.
|
| 2751 | |
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
| 2752 | |
-done
|
| 2753 | |
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
| 2754 | |
+ done
|
| 2755 | |
IFS=$as_save_IFS
|
| 2756 | |
|
| 2757 | |
;;
|
| 2758 | |
@@ -2913,12 +2815,16 @@
|
| 2759 | |
fi
|
| 2760 | |
if test ! -f "$as_myself"; then
|
| 2761 | |
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
| 2762 | |
- { (exit 1); exit 1; }
|
| 2763 | |
+ exit 1
|
| 2764 | |
fi
|
| 2765 | |
|
| 2766 | |
-# Work around bugs in pre-3.0 UWIN ksh.
|
| 2767 | |
-for as_var in ENV MAIL MAILPATH
|
| 2768 | |
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
| 2769 | |
+# Unset variables that we do not need and which cause bugs (e.g. in
|
| 2770 | |
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
|
| 2771 | |
+# suppresses any "Segmentation fault" message there. '((' could
|
| 2772 | |
+# trigger a bug in pdksh 5.2.14.
|
| 2773 | |
+for as_var in BASH_ENV ENV MAIL MAILPATH
|
| 2774 | |
+do eval test x\${$as_var+set} = xset \
|
| 2775 | |
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
|
| 2776 | |
done
|
| 2777 | |
PS1='$ '
|
| 2778 | |
PS2='> '
|
| 2779 | |
@@ -2930,7 +2836,89 @@
|
| 2780 | |
LANGUAGE=C
|
| 2781 | |
export LANGUAGE
|
| 2782 | |
|
| 2783 | |
-# Required to use basename.
|
| 2784 | |
+# CDPATH.
|
| 2785 | |
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
| 2786 | |
+
|
| 2787 | |
+
|
| 2788 | |
+# as_fn_error ERROR [LINENO LOG_FD]
|
| 2789 | |
+# ---------------------------------
|
| 2790 | |
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
| 2791 | |
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
| 2792 | |
+# script with status $?, using 1 if that was 0.
|
| 2793 | |
+as_fn_error ()
|
| 2794 | |
+{
|
| 2795 | |
+ as_status=$?; test $as_status -eq 0 && as_status=1
|
| 2796 | |
+ if test "$3"; then
|
| 2797 | |
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
| 2798 | |
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
| 2799 | |
+ fi
|
| 2800 | |
+ $as_echo "$as_me: error: $1" >&2
|
| 2801 | |
+ as_fn_exit $as_status
|
| 2802 | |
+} # as_fn_error
|
| 2803 | |
+
|
| 2804 | |
+
|
| 2805 | |
+# as_fn_set_status STATUS
|
| 2806 | |
+# -----------------------
|
| 2807 | |
+# Set $? to STATUS, without forking.
|
| 2808 | |
+as_fn_set_status ()
|
| 2809 | |
+{
|
| 2810 | |
+ return $1
|
| 2811 | |
+} # as_fn_set_status
|
| 2812 | |
+
|
| 2813 | |
+# as_fn_exit STATUS
|
| 2814 | |
+# -----------------
|
| 2815 | |
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
|
| 2816 | |
+as_fn_exit ()
|
| 2817 | |
+{
|
| 2818 | |
+ set +e
|
| 2819 | |
+ as_fn_set_status $1
|
| 2820 | |
+ exit $1
|
| 2821 | |
+} # as_fn_exit
|
| 2822 | |
+
|
| 2823 | |
+# as_fn_unset VAR
|
| 2824 | |
+# ---------------
|
| 2825 | |
+# Portably unset VAR.
|
| 2826 | |
+as_fn_unset ()
|
| 2827 | |
+{
|
| 2828 | |
+ { eval $1=; unset $1;}
|
| 2829 | |
+}
|
| 2830 | |
+as_unset=as_fn_unset
|
| 2831 | |
+# as_fn_append VAR VALUE
|
| 2832 | |
+# ----------------------
|
| 2833 | |
+# Append the text in VALUE to the end of the definition contained in VAR. Take
|
| 2834 | |
+# advantage of any shell optimizations that allow amortized linear growth over
|
| 2835 | |
+# repeated appends, instead of the typical quadratic growth present in naive
|
| 2836 | |
+# implementations.
|
| 2837 | |
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
|
| 2838 | |
+ eval 'as_fn_append ()
|
| 2839 | |
+ {
|
| 2840 | |
+ eval $1+=\$2
|
| 2841 | |
+ }'
|
| 2842 | |
+else
|
| 2843 | |
+ as_fn_append ()
|
| 2844 | |
+ {
|
| 2845 | |
+ eval $1=\$$1\$2
|
| 2846 | |
+ }
|
| 2847 | |
+fi # as_fn_append
|
| 2848 | |
+
|
| 2849 | |
+# as_fn_arith ARG...
|
| 2850 | |
+# ------------------
|
| 2851 | |
+# Perform arithmetic evaluation on the ARGs, and store the result in the
|
| 2852 | |
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
|
| 2853 | |
+# must be portable across $(()) and expr.
|
| 2854 | |
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
|
| 2855 | |
+ eval 'as_fn_arith ()
|
| 2856 | |
+ {
|
| 2857 | |
+ as_val=$(( $* ))
|
| 2858 | |
+ }'
|
| 2859 | |
+else
|
| 2860 | |
+ as_fn_arith ()
|
| 2861 | |
+ {
|
| 2862 | |
+ as_val=`expr "$@" || test $? -eq 1`
|
| 2863 | |
+ }
|
| 2864 | |
+fi # as_fn_arith
|
| 2865 | |
+
|
| 2866 | |
+
|
| 2867 | |
if expr a : '\(a\)' >/dev/null 2>&1 &&
|
| 2868 | |
test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
| 2869 | |
as_expr=expr
|
| 2870 | |
@@ -2944,8 +2932,12 @@
|
| 2871 | |
as_basename=false
|
| 2872 | |
fi
|
| 2873 | |
|
| 2874 | |
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
| 2875 | |
+ as_dirname=dirname
|
| 2876 | |
+else
|
| 2877 | |
+ as_dirname=false
|
| 2878 | |
+fi
|
| 2879 | |
|
| 2880 | |
-# Name of the executable.
|
| 2881 | |
as_me=`$as_basename -- "$0" ||
|
| 2882 | |
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
| 2883 | |
X"$0" : 'X\(//\)$' \| \
|
| 2884 | |
@@ -2965,76 +2957,25 @@
|
| 2885 | |
}
|
| 2886 | |
s/.*/./; q'`
|
| 2887 | |
|
| 2888 | |
-# CDPATH.
|
| 2889 | |
-$as_unset CDPATH
|
| 2890 | |
-
|
| 2891 | |
-
|
| 2892 | |
-
|
| 2893 | |
- as_lineno_1=$LINENO
|
| 2894 | |
- as_lineno_2=$LINENO
|
| 2895 | |
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
| 2896 | |
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
| 2897 | |
-
|
| 2898 | |
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
| 2899 | |
- # uniformly replaced by the line number. The first 'sed' inserts a
|
| 2900 | |
- # line-number line after each line using $LINENO; the second 'sed'
|
| 2901 | |
- # does the real work. The second script uses 'N' to pair each
|
| 2902 | |
- # line-number line with the line containing $LINENO, and appends
|
| 2903 | |
- # trailing '-' during substitution so that $LINENO is not a special
|
| 2904 | |
- # case at line end.
|
| 2905 | |
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
| 2906 | |
- # scripts with optimization help from Paolo Bonzini. Blame Lee
|
| 2907 | |
- # E. McMahon (1931-1989) for sed's syntax. :-)
|
| 2908 | |
- sed -n '
|
| 2909 | |
- p
|
| 2910 | |
- /[$]LINENO/=
|
| 2911 | |
- ' <$as_myself |
|
| 2912 | |
- sed '
|
| 2913 | |
- s/[$]LINENO.*/&-/
|
| 2914 | |
- t lineno
|
| 2915 | |
- b
|
| 2916 | |
- :lineno
|
| 2917 | |
- N
|
| 2918 | |
- :loop
|
| 2919 | |
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
| 2920 | |
- t loop
|
| 2921 | |
- s/-\n.*//
|
| 2922 | |
- ' >$as_me.lineno &&
|
| 2923 | |
- chmod +x "$as_me.lineno" ||
|
| 2924 | |
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
| 2925 | |
- { (exit 1); exit 1; }; }
|
| 2926 | |
-
|
| 2927 | |
- # Don't try to exec as it changes $[0], causing all sort of problems
|
| 2928 | |
- # (the dirname of $[0] is not the place where we might find the
|
| 2929 | |
- # original and so on. Autoconf is especially sensitive to this).
|
| 2930 | |
- . "./$as_me.lineno"
|
| 2931 | |
- # Exit status is that of the last command.
|
| 2932 | |
- exit
|
| 2933 | |
-}
|
| 2934 | |
-
|
| 2935 | |
-
|
| 2936 | |
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
| 2937 | |
- as_dirname=dirname
|
| 2938 | |
-else
|
| 2939 | |
- as_dirname=false
|
| 2940 | |
-fi
|
| 2941 | |
+# Avoid depending upon Character Ranges.
|
| 2942 | |
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
| 2943 | |
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
| 2944 | |
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
| 2945 | |
+as_cr_digits='0123456789'
|
| 2946 | |
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
| 2947 | |
|
| 2948 | |
ECHO_C= ECHO_N= ECHO_T=
|
| 2949 | |
-case `echo -n x` in
|
| 2950 | |
+case `echo -n x` in #(((((
|
| 2951 | |
-n*)
|
| 2952 | |
- case `echo 'x\c'` in
|
| 2953 | |
+ case `echo 'xy\c'` in
|
| 2954 | |
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
| 2955 | |
- *) ECHO_C='\c';;
|
| 2956 | |
+ xy) ECHO_C='\c';;
|
| 2957 | |
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
|
| 2958 | |
+ ECHO_T=' ';;
|
| 2959 | |
esac;;
|
| 2960 | |
*)
|
| 2961 | |
ECHO_N='-n';;
|
| 2962 | |
esac
|
| 2963 | |
-if expr a : '\(a\)' >/dev/null 2>&1 &&
|
| 2964 | |
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
| 2965 | |
- as_expr=expr
|
| 2966 | |
-else
|
| 2967 | |
- as_expr=false
|
| 2968 | |
-fi
|
| 2969 | |
|
| 2970 | |
rm -f conf$$ conf$$.exe conf$$.file
|
| 2971 | |
if test -d conf$$.dir; then
|
| 2972 | |
@@ -3063,8 +3004,56 @@
|
| 2973 | |
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
| 2974 | |
rmdir conf$$.dir 2>/dev/null
|
| 2975 | |
|
| 2976 | |
+
|
| 2977 | |
+# as_fn_mkdir_p
|
| 2978 | |
+# -------------
|
| 2979 | |
+# Create "$as_dir" as a directory, including parents if necessary.
|
| 2980 | |
+as_fn_mkdir_p ()
|
| 2981 | |
+{
|
| 2982 | |
+
|
| 2983 | |
+ case $as_dir in #(
|
| 2984 | |
+ -*) as_dir=./$as_dir;;
|
| 2985 | |
+ esac
|
| 2986 | |
+ test -d "$as_dir" || eval $as_mkdir_p || {
|
| 2987 | |
+ as_dirs=
|
| 2988 | |
+ while :; do
|
| 2989 | |
+ case $as_dir in #(
|
| 2990 | |
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
|
| 2991 | |
+ *) as_qdir=$as_dir;;
|
| 2992 | |
+ esac
|
| 2993 | |
+ as_dirs="'$as_qdir' $as_dirs"
|
| 2994 | |
+ as_dir=`$as_dirname -- "$as_dir" ||
|
| 2995 | |
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
| 2996 | |
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
| 2997 | |
+ X"$as_dir" : 'X\(//\)$' \| \
|
| 2998 | |
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
| 2999 | |
+$as_echo X"$as_dir" |
|
| 3000 | |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
| 3001 | |
+ s//\1/
|
| 3002 | |
+ q
|
| 3003 | |
+ }
|
| 3004 | |
+ /^X\(\/\/\)[^/].*/{
|
| 3005 | |
+ s//\1/
|
| 3006 | |
+ q
|
| 3007 | |
+ }
|
| 3008 | |
+ /^X\(\/\/\)$/{
|
| 3009 | |
+ s//\1/
|
| 3010 | |
+ q
|
| 3011 | |
+ }
|
| 3012 | |
+ /^X\(\/\).*/{
|
| 3013 | |
+ s//\1/
|
| 3014 | |
+ q
|
| 3015 | |
+ }
|
| 3016 | |
+ s/.*/./; q'`
|
| 3017 | |
+ test -d "$as_dir" && break
|
| 3018 | |
+ done
|
| 3019 | |
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
| 3020 | |
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
| 3021 | |
+
|
| 3022 | |
+
|
| 3023 | |
+} # as_fn_mkdir_p
|
| 3024 | |
if mkdir -p . 2>/dev/null; then
|
| 3025 | |
- as_mkdir_p=:
|
| 3026 | |
+ as_mkdir_p='mkdir -p "$as_dir"'
|
| 3027 | |
else
|
| 3028 | |
test -d ./-p && rmdir ./-p
|
| 3029 | |
as_mkdir_p=false
|
| 3030 | |
@@ -3083,10 +3072,10 @@
|
| 3031 | |
if test -d "$1"; then
|
| 3032 | |
test -d "$1/.";
|
| 3033 | |
else
|
| 3034 | |
- case $1 in
|
| 3035 | |
+ case $1 in #(
|
| 3036 | |
-*)set "./$1";;
|
| 3037 | |
esac;
|
| 3038 | |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
| 3039 | |
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
| 3040 | |
???[sx]*):;;*)false;;esac;fi
|
| 3041 | |
'\'' sh
|
| 3042 | |
'
|
| 3043 | |
@@ -3101,13 +3090,19 @@
|
| 3044 | |
|
| 3045 | |
|
| 3046 | |
exec 6>&1
|
| 3047 | |
+## ----------------------------------- ##
|
| 3048 | |
+## Main body of $CONFIG_STATUS script. ##
|
| 3049 | |
+## ----------------------------------- ##
|
| 3050 | |
+_ASEOF
|
| 3051 | |
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
|
| 3052 | |
|
| 3053 | |
-# Save the log message, to keep $[0] and so on meaningful, and to
|
| 3054 | |
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
| 3055 | |
+# Save the log message, to keep $0 and so on meaningful, and to
|
| 3056 | |
# report actual input values of CONFIG_FILES etc. instead of their
|
| 3057 | |
# values after options handling.
|
| 3058 | |
ac_log="
|
| 3059 | |
This file was extended by gnome-user-docs $as_me 2.28.0, which was
|
| 3060 | |
-generated by GNU Autoconf 2.63. Invocation command line was
|
| 3061 | |
+generated by GNU Autoconf 2.64. Invocation command line was
|
| 3062 | |
|
| 3063 | |
CONFIG_FILES = $CONFIG_FILES
|
| 3064 | |
CONFIG_HEADERS = $CONFIG_HEADERS
|
| 3065 | |
@@ -3134,10 +3129,11 @@
|
| 3066 | |
|
| 3067 | |
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
| 3068 | |
ac_cs_usage="\
|
| 3069 | |
-\`$as_me' instantiates files from templates according to the
|
| 3070 | |
-current configuration.
|
| 3071 | |
+\`$as_me' instantiates files and other configuration actions
|
| 3072 | |
+from templates according to the current configuration. Unless the files
|
| 3073 | |
+and actions are specified as TAGs, all are instantiated by default.
|
| 3074 | |
|
| 3075 | |
-Usage: $0 [OPTION]... [FILE]...
|
| 3076 | |
+Usage: $0 [OPTION]... [TAG]...
|
| 3077 | |
|
| 3078 | |
-h, --help print this help, then exit
|
| 3079 | |
-V, --version print version number and configuration settings, then exit
|
| 3080 | |
@@ -3151,16 +3147,16 @@
|
| 3081 | |
Configuration files:
|
| 3082 | |
$config_files
|
| 3083 | |
|
| 3084 | |
-Report bugs to <bug-autoconf@gnu.org>."
|
| 3085 | |
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-docs>."
|
| 3086 | |
|
| 3087 | |
_ACEOF
|
| 3088 | |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| 3089 | |
ac_cs_version="\\
|
| 3090 | |
gnome-user-docs config.status 2.28.0
|
| 3091 | |
-configured by $0, generated by GNU Autoconf 2.63,
|
| 3092 | |
+configured by $0, generated by GNU Autoconf 2.64,
|
| 3093 | |
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
| 3094 | |
|
| 3095 | |
-Copyright (C) 2008 Free Software Foundation, Inc.
|
| 3096 | |
+Copyright (C) 2009 Free Software Foundation, Inc.
|
| 3097 | |
This config.status script is free software; the Free Software Foundation
|
| 3098 | |
gives unlimited permission to copy, distribute and modify it."
|
| 3099 | |
|
| 3100 | |
@@ -3203,7 +3199,7 @@
|
| 3101 | |
case $ac_optarg in
|
| 3102 | |
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
| 3103 | |
esac
|
| 3104 | |
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
|
| 3105 | |
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
|
| 3106 | |
ac_need_defaults=false;;
|
| 3107 | |
--he | --h | --help | --hel | -h )
|
| 3108 | |
$as_echo "$ac_cs_usage"; exit ;;
|
| 3109 | |
@@ -3212,11 +3208,10 @@
|
| 3110 | |
ac_cs_silent=: ;;
|
| 3111 | |
|
| 3112 | |
# This is an error.
|
| 3113 | |
- -*) { $as_echo "$as_me: error: unrecognized option: $1
|
| 3114 | |
-Try \`$0 --help' for more information." >&2
|
| 3115 | |
- { (exit 1); exit 1; }; } ;;
|
| 3116 | |
+ -*) as_fn_error "unrecognized option: \`$1'
|
| 3117 | |
+Try \`$0 --help' for more information." ;;
|
| 3118 | |
|
| 3119 | |
- *) ac_config_targets="$ac_config_targets $1"
|
| 3120 | |
+ *) as_fn_append ac_config_targets " $1"
|
| 3121 | |
ac_need_defaults=false ;;
|
| 3122 | |
|
| 3123 | |
esac
|
| 3124 | |
@@ -3268,9 +3263,7 @@
|
| 3125 | |
"gnome2-accessibility-guide/Makefile") CONFIG_FILES="$CONFIG_FILES gnome2-accessibility-guide/Makefile" ;;
|
| 3126 | |
"gnome2-system-admin-guide/Makefile") CONFIG_FILES="$CONFIG_FILES gnome2-system-admin-guide/Makefile" ;;
|
| 3127 | |
|
| 3128 | |
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
| 3129 | |
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
| 3130 | |
- { (exit 1); exit 1; }; };;
|
| 3131 | |
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
| 3132 | |
esac
|
| 3133 | |
done
|
| 3134 | |
|
| 3135 | |
@@ -3295,7 +3288,7 @@
|
| 3136 | |
trap 'exit_status=$?
|
| 3137 | |
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
| 3138 | |
' 0
|
| 3139 | |
- trap '{ (exit 1); exit 1; }' 1 2 13 15
|
| 3140 | |
+ trap 'as_fn_exit 1' 1 2 13 15
|
| 3141 | |
}
|
| 3142 | |
# Create a (secure) tmp directory for tmp files.
|
| 3143 | |
|
| 3144 | |
@@ -3306,11 +3299,7 @@
|
| 3145 | |
{
|
| 3146 | |
tmp=./conf$$-$RANDOM
|
| 3147 | |
(umask 077 && mkdir "$tmp")
|
| 3148 | |
-} ||
|
| 3149 | |
-{
|
| 3150 | |
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
|
| 3151 | |
- { (exit 1); exit 1; }
|
| 3152 | |
-}
|
| 3153 | |
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
|
| 3154 | |
|
| 3155 | |
# Set up the scripts for CONFIG_FILES section.
|
| 3156 | |
# No need to generate them if there are no CONFIG_FILES.
|
| 3157 | |
@@ -3318,10 +3307,16 @@
|
| 3158 | |
if test -n "$CONFIG_FILES"; then
|
| 3159 | |
|
| 3160 | |
|
| 3161 | |
-ac_cr='
⏎
|
| 3162 | |
'
|
| 3163 | |
+ac_cr=`echo X | tr X '\015'`
|
| 3164 | |
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
|
| 3165 | |
+# But we know of no other shell where ac_cr would be empty at this
|
| 3166 | |
+# point, so we can use a bashism as a fallback.
|
| 3167 | |
+if test "x$ac_cr" = x; then
|
| 3168 | |
+ eval ac_cr=\$\'\\r\'
|
| 3169 | |
+fi
|
| 3170 | |
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
| 3171 | |
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
| 3172 | |
- ac_cs_awk_cr='\\r'
|
| 3173 | |
+ ac_cs_awk_cr='\r'
|
| 3174 | |
else
|
| 3175 | |
ac_cs_awk_cr=$ac_cr
|
| 3176 | |
fi
|
| 3177 | |
@@ -3335,24 +3330,18 @@
|
| 3178 | |
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
| 3179 | |
echo "_ACEOF"
|
| 3180 | |
} >conf$$subs.sh ||
|
| 3181 | |
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
| 3182 | |
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
| 3183 | |
- { (exit 1); exit 1; }; }
|
| 3184 | |
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
| 3185 | |
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
|
| 3186 | |
ac_delim='%!_!# '
|
| 3187 | |
for ac_last_try in false false false false false :; do
|
| 3188 | |
. ./conf$$subs.sh ||
|
| 3189 | |
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
| 3190 | |
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
| 3191 | |
- { (exit 1); exit 1; }; }
|
| 3192 | |
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
| 3193 | |
|
| 3194 | |
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
| 3195 | |
if test $ac_delim_n = $ac_delim_num; then
|
| 3196 | |
break
|
| 3197 | |
elif $ac_last_try; then
|
| 3198 | |
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
| 3199 | |
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
| 3200 | |
- { (exit 1); exit 1; }; }
|
| 3201 | |
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
| 3202 | |
else
|
| 3203 | |
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
| 3204 | |
fi
|
| 3205 | |
@@ -3441,9 +3430,7 @@
|
| 3206 | |
else
|
| 3207 | |
cat
|
| 3208 | |
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
| 3209 | |
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
|
| 3210 | |
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
|
| 3211 | |
- { (exit 1); exit 1; }; }
|
| 3212 | |
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
|
| 3213 | |
_ACEOF
|
| 3214 | |
|
| 3215 | |
# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
| 3216 | |
@@ -3474,9 +3461,7 @@
|
| 3217 | |
esac
|
| 3218 | |
case $ac_mode$ac_tag in
|
| 3219 | |
:[FHL]*:*);;
|
| 3220 | |
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
|
| 3221 | |
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
|
| 3222 | |
- { (exit 1); exit 1; }; };;
|
| 3223 | |
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
| 3224 | |
:[FH]-) ac_tag=-:-;;
|
| 3225 | |
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
| 3226 | |
esac
|
| 3227 | |
@@ -3504,12 +3489,10 @@
|
| 3228 | |
[\\/$]*) false;;
|
| 3229 | |
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
| 3230 | |
esac ||
|
| 3231 | |
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
|
| 3232 | |
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
|
| 3233 | |
- { (exit 1); exit 1; }; };;
|
| 3234 | |
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
| 3235 | |
esac
|
| 3236 | |
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
| 3237 | |
- ac_file_inputs="$ac_file_inputs '$ac_f'"
|
| 3238 | |
+ as_fn_append ac_file_inputs " '$ac_f'"
|
| 3239 | |
done
|
| 3240 | |
|
| 3241 | |
# Let's still pretend it is `configure' which instantiates (i.e., don't
|
| 3242 | |
@@ -3520,7 +3503,7 @@
|
| 3243 | |
`' by configure.'
|
| 3244 | |
if test x"$ac_file" != x-; then
|
| 3245 | |
configure_input="$ac_file. $configure_input"
|
| 3246 | |
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
|
| 3247 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
|
| 3248 | |
$as_echo "$as_me: creating $ac_file" >&6;}
|
| 3249 | |
fi
|
| 3250 | |
# Neutralize special characters interpreted by sed in replacement strings.
|
| 3251 | |
@@ -3533,9 +3516,7 @@
|
| 3252 | |
|
| 3253 | |
case $ac_tag in
|
| 3254 | |
*:-:* | *:-) cat >"$tmp/stdin" \
|
| 3255 | |
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
| 3256 | |
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
| 3257 | |
- { (exit 1); exit 1; }; } ;;
|
| 3258 | |
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
|
| 3259 | |
esac
|
| 3260 | |
;;
|
| 3261 | |
esac
|
| 3262 | |
@@ -3563,47 +3544,7 @@
|
| 3263 | |
q
|
| 3264 | |
}
|
| 3265 | |
s/.*/./; q'`
|
| 3266 | |
- { as_dir="$ac_dir"
|
| 3267 | |
- case $as_dir in #(
|
| 3268 | |
- -*) as_dir=./$as_dir;;
|
| 3269 | |
- esac
|
| 3270 | |
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
| 3271 | |
- as_dirs=
|
| 3272 | |
- while :; do
|
| 3273 | |
- case $as_dir in #(
|
| 3274 | |
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
|
| 3275 | |
- *) as_qdir=$as_dir;;
|
| 3276 | |
- esac
|
| 3277 | |
- as_dirs="'$as_qdir' $as_dirs"
|
| 3278 | |
- as_dir=`$as_dirname -- "$as_dir" ||
|
| 3279 | |
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
| 3280 | |
- X"$as_dir" : 'X\(//\)[^/]' \| \
|
| 3281 | |
- X"$as_dir" : 'X\(//\)$' \| \
|
| 3282 | |
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
| 3283 | |
-$as_echo X"$as_dir" |
|
| 3284 | |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
| 3285 | |
- s//\1/
|
| 3286 | |
- q
|
| 3287 | |
- }
|
| 3288 | |
- /^X\(\/\/\)[^/].*/{
|
| 3289 | |
- s//\1/
|
| 3290 | |
- q
|
| 3291 | |
- }
|
| 3292 | |
- /^X\(\/\/\)$/{
|
| 3293 | |
- s//\1/
|
| 3294 | |
- q
|
| 3295 | |
- }
|
| 3296 | |
- /^X\(\/\).*/{
|
| 3297 | |
- s//\1/
|
| 3298 | |
- q
|
| 3299 | |
- }
|
| 3300 | |
- s/.*/./; q'`
|
| 3301 | |
- test -d "$as_dir" && break
|
| 3302 | |
- done
|
| 3303 | |
- test -z "$as_dirs" || eval "mkdir $as_dirs"
|
| 3304 | |
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
| 3305 | |
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
| 3306 | |
- { (exit 1); exit 1; }; }; }
|
| 3307 | |
+ as_dir="$ac_dir"; as_fn_mkdir_p
|
| 3308 | |
ac_builddir=.
|
| 3309 | |
|
| 3310 | |
case "$ac_dir" in
|
| 3311 | |
@@ -3660,7 +3601,6 @@
|
| 3312 | |
# If the template does not know about datarootdir, expand it.
|
| 3313 | |
# FIXME: This hack should be removed a few years after 2.60.
|
| 3314 | |
ac_datarootdir_hack=; ac_datarootdir_seen=
|
| 3315 | |
-
|
| 3316 | |
ac_sed_dataroot='
|
| 3317 | |
/datarootdir/ {
|
| 3318 | |
p
|
| 3319 | |
@@ -3670,12 +3610,11 @@
|
| 3320 | |
/@docdir@/p
|
| 3321 | |
/@infodir@/p
|
| 3322 | |
/@localedir@/p
|
| 3323 | |
-/@mandir@/p
|
| 3324 | |
-'
|
| 3325 | |
+/@mandir@/p'
|
| 3326 | |
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
|
| 3327 | |
*datarootdir*) ac_datarootdir_seen=yes;;
|
| 3328 | |
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
|
| 3329 | |
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
| 3330 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
| 3331 | |
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
| 3332 | |
_ACEOF
|
| 3333 | |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| 3334 | |
@@ -3685,7 +3624,7 @@
|
| 3335 | |
s&@infodir@&$infodir&g
|
| 3336 | |
s&@localedir@&$localedir&g
|
| 3337 | |
s&@mandir@&$mandir&g
|
| 3338 | |
- s&\\\${datarootdir}&$datarootdir&g' ;;
|
| 3339 | |
+ s&\\\${datarootdir}&$datarootdir&g' ;;
|
| 3340 | |
esac
|
| 3341 | |
_ACEOF
|
| 3342 | |
|
| 3343 | |
@@ -3714,14 +3653,12 @@
|
| 3344 | |
$ac_datarootdir_hack
|
| 3345 | |
"
|
| 3346 | |
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
| 3347 | |
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
| 3348 | |
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
| 3349 | |
- { (exit 1); exit 1; }; }
|
| 3350 | |
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
| 3351 | |
|
| 3352 | |
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
| 3353 | |
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
| 3354 | |
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
| 3355 | |
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
| 3356 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
| 3357 | |
which seems to be undefined. Please make sure it is defined." >&5
|
| 3358 | |
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
| 3359 | |
which seems to be undefined. Please make sure it is defined." >&2;}
|
| 3360 | |
@@ -3731,9 +3668,7 @@
|
| 3361 | |
-) cat "$tmp/out" && rm -f "$tmp/out";;
|
| 3362 | |
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
| 3363 | |
esac \
|
| 3364 | |
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
| 3365 | |
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
| 3366 | |
- { (exit 1); exit 1; }; }
|
| 3367 | |
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
| 3368 | |
;;
|
| 3369 | |
|
| 3370 | |
|
| 3371 | |
@@ -3743,15 +3678,12 @@
|
| 3372 | |
done # for ac_tag
|
| 3373 | |
|
| 3374 | |
|
| 3375 | |
-{ (exit 0); exit 0; }
|
| 3376 | |
+as_fn_exit 0
|
| 3377 | |
_ACEOF
|
| 3378 | |
-chmod +x $CONFIG_STATUS
|
| 3379 | |
ac_clean_files=$ac_clean_files_save
|
| 3380 | |
|
| 3381 | |
test $ac_write_fail = 0 ||
|
| 3382 | |
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
|
| 3383 | |
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
|
| 3384 | |
- { (exit 1); exit 1; }; }
|
| 3385 | |
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
| 3386 | |
|
| 3387 | |
|
| 3388 | |
# configure is writing to config.log, and then calls config.status.
|
| 3389 | |
@@ -3772,10 +3704,10 @@
|
| 3390 | |
exec 5>>config.log
|
| 3391 | |
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
|
| 3392 | |
# would make configure fail if this is the last instruction.
|
| 3393 | |
- $ac_cs_success || { (exit 1); exit 1; }
|
| 3394 | |
+ $ac_cs_success || as_fn_exit $?
|
| 3395 | |
fi
|
| 3396 | |
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
| 3397 | |
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
| 3398 | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
| 3399 | |
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
|
| 3400 | |
fi
|
| 3401 | |
|
| 3402 | |
diff -Nur -x '*.orig' -x '*~' gnome-user-docs-2.28.0/gnome2-accessibility-guide/Makefile.in gnome-user-docs-2.28.0.new/gnome2-accessibility-guide/Makefile.in
|
| 3403 | |
--- gnome-user-docs-2.28.0/gnome2-accessibility-guide/Makefile.in 2009-09-21 18:33:34.000000000 +0200
|
| 3404 | |
+++ gnome-user-docs-2.28.0.new/gnome2-accessibility-guide/Makefile.in 2009-09-27 23:57:29.092801971 +0200
|
| 3405 | |
@@ -1,8 +1,9 @@
|
| 3406 | |
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
| 3407 | |
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
| 3408 | |
# @configure_input@
|
| 3409 | |
|
| 3410 | |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
| 3411 | |
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
| 3412 | |
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
| 3413 | |
+# Inc.
|
| 3414 | |
# This Makefile.in is free software; the Free Software Foundation
|
| 3415 | |
# gives unlimited permission to copy and/or distribute it,
|
| 3416 | |
# with or without modifications, as long as this notice is preserved.
|
| 3417 | |
@@ -39,8 +40,9 @@
|
| 3418 | |
################################################################################
|
| 3419 | |
VPATH = @srcdir@
|
| 3420 | |
pkgdatadir = $(datadir)/@PACKAGE@
|
| 3421 | |
-pkglibdir = $(libdir)/@PACKAGE@
|
| 3422 | |
pkgincludedir = $(includedir)/@PACKAGE@
|
| 3423 | |
+pkglibdir = $(libdir)/@PACKAGE@
|
| 3424 | |
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
| 3425 | |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
| 3426 | |
install_sh_DATA = $(install_sh) -c -m 644
|
| 3427 | |
install_sh_PROGRAM = $(install_sh) -c
|
| 3428 | |
@@ -62,6 +64,7 @@
|
| 3429 | |
$(ACLOCAL_M4)
|
| 3430 | |
mkinstalldirs = $(install_sh) -d
|
| 3431 | |
CONFIG_CLEAN_FILES =
|
| 3432 | |
+CONFIG_CLEAN_VPATH_FILES =
|
| 3433 | |
SOURCES =
|
| 3434 | |
DIST_SOURCES =
|
| 3435 | |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
| 3436 | |
@@ -99,6 +102,7 @@
|
| 3437 | |
PACKAGE_NAME = @PACKAGE_NAME@
|
| 3438 | |
PACKAGE_STRING = @PACKAGE_STRING@
|
| 3439 | |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
| 3440 | |
+PACKAGE_URL = @PACKAGE_URL@
|
| 3441 | |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
| 3442 | |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
| 3443 | |
PKG_CONFIG = @PKG_CONFIG@
|
| 3444 | |
@@ -273,14 +277,14 @@
|
| 3445 | |
@for dep in $?; do \
|
| 3446 | |
case '$(am__configure_deps)' in \
|
| 3447 | |
*$$dep*) \
|
| 3448 | |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
|
| 3449 | |
- && exit 0; \
|
| 3450 | |
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
|
| 3451 | |
+ && { if test -f $@; then exit 0; else break; fi; }; \
|
| 3452 | |
exit 1;; \
|
| 3453 | |
esac; \
|
| 3454 | |
done; \
|
| 3455 | |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gnome2-accessibility-guide/Makefile'; \
|
| 3456 | |
- cd $(top_srcdir) && \
|
| 3457 | |
- $(AUTOMAKE) --gnu gnome2-accessibility-guide/Makefile
|
| 3458 | |
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gnome2-accessibility-guide/Makefile'; \
|
| 3459 | |
+ $(am__cd) $(top_srcdir) && \
|
| 3460 | |
+ $(AUTOMAKE) --gnu gnome2-accessibility-guide/Makefile
|
| 3461 | |
.PRECIOUS: Makefile
|
| 3462 | |
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
| 3463 | |
@case '$?' in \
|
| 3464 | |
@@ -298,6 +302,7 @@
|
| 3465 | |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
| 3466 | |
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
| 3467 | |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
| 3468 | |
+$(am__aclocal_m4_deps):
|
| 3469 | |
tags: TAGS
|
| 3470 | |
TAGS:
|
| 3471 | |
|
| 3472 | |
@@ -321,13 +326,17 @@
|
| 3473 | |
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
| 3474 | |
if test -d $$d/$$file; then \
|
| 3475 | |
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
| 3476 | |
+ if test -d "$(distdir)/$$file"; then \
|
| 3477 | |
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
| 3478 | |
+ fi; \
|
| 3479 | |
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
| 3480 | |
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
| 3481 | |
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
| 3482 | |
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
| 3483 | |
fi; \
|
| 3484 | |
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
| 3485 | |
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
| 3486 | |
else \
|
| 3487 | |
- test -f $(distdir)/$$file \
|
| 3488 | |
- || cp -p $$d/$$file $(distdir)/$$file \
|
| 3489 | |
+ test -f "$(distdir)/$$file" \
|
| 3490 | |
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
| 3491 | |
|| exit 1; \
|
| 3492 | |
fi; \
|
| 3493 | |
done
|
| 3494 | |
@@ -358,6 +367,7 @@
|
| 3495 | |
|
| 3496 | |
distclean-generic:
|
| 3497 | |
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
| 3498 | |
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
| 3499 | |
|
| 3500 | |
maintainer-clean-generic:
|
| 3501 | |
@echo "This command is intended for maintainers to use"
|
| 3502 | |
@@ -376,6 +386,8 @@
|
| 3503 | |
|
| 3504 | |
html: html-am
|
| 3505 | |
|
| 3506 | |
+html-am:
|
| 3507 | |
+
|
| 3508 | |
info: info-am
|
| 3509 | |
|
| 3510 | |
info-am:
|
| 3511 | |
@@ -384,18 +396,28 @@
|
| 3512 | |
|
| 3513 | |
install-dvi: install-dvi-am
|
| 3514 | |
|
| 3515 | |
+install-dvi-am:
|
| 3516 | |
+
|
| 3517 | |
install-exec-am:
|
| 3518 | |
|
| 3519 | |
install-html: install-html-am
|
| 3520 | |
|
| 3521 | |
+install-html-am:
|
| 3522 | |
+
|
| 3523 | |
install-info: install-info-am
|
| 3524 | |
|
| 3525 | |
+install-info-am:
|
| 3526 | |
+
|
| 3527 | |
install-man:
|
| 3528 | |
|
| 3529 | |
install-pdf: install-pdf-am
|
| 3530 | |
|
| 3531 | |
+install-pdf-am:
|
| 3532 | |
+
|
| 3533 | |
install-ps: install-ps-am
|
| 3534 | |
|
| 3535 | |
+install-ps-am:
|
| 3536 | |
+
|
| 3537 | |
installcheck-am:
|
| 3538 | |
|
| 3539 | |
maintainer-clean: maintainer-clean-am
|
| 3540 | |
@@ -615,7 +637,7 @@
|
| 3541 | |
rm -f "$$lc/.xml2po.mo"; \
|
| 3542 | |
fi; \
|
| 3543 | |
done
|
| 3544 | |
-clean-doc-dir:
|
| 3545 | |
+clean-doc-dir: clean-doc-lc
|
| 3546 | |
@for lc in C $(_DOC_REAL_LINGUAS); do \
|
| 3547 | |
for dir in `find $$lc -depth -type d`; do \
|
| 3548 | |
if ! test $$dir -ef $(srcdir)/$$dir; then \
|
| 3549 | |
@@ -847,6 +869,7 @@
|
| 3550 | |
$(INSTALL_DATA) "$$spdf" "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$pdf"; \
|
| 3551 | |
fi; \
|
| 3552 | |
done
|
| 3553 | |
+
|
| 3554 | |
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
| 3555 | |
# Otherwise a system limit (for SysV at least) may be exceeded.
|
| 3556 | |
.NOEXPORT:
|
| 3557 | |
diff -Nur -x '*.orig' -x '*~' gnome-user-docs-2.28.0/gnome2-system-admin-guide/Makefile.in gnome-user-docs-2.28.0.new/gnome2-system-admin-guide/Makefile.in
|
| 3558 | |
--- gnome-user-docs-2.28.0/gnome2-system-admin-guide/Makefile.in 2009-09-21 18:33:34.000000000 +0200
|
| 3559 | |
+++ gnome-user-docs-2.28.0.new/gnome2-system-admin-guide/Makefile.in 2009-09-27 23:57:29.368801831 +0200
|
| 3560 | |
@@ -1,8 +1,9 @@
|
| 3561 | |
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
| 3562 | |
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
| 3563 | |
# @configure_input@
|
| 3564 | |
|
| 3565 | |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
| 3566 | |
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
| 3567 | |
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
| 3568 | |
+# Inc.
|
| 3569 | |
# This Makefile.in is free software; the Free Software Foundation
|
| 3570 | |
# gives unlimited permission to copy and/or distribute it,
|
| 3571 | |
# with or without modifications, as long as this notice is preserved.
|
| 3572 | |
@@ -39,8 +40,9 @@
|
| 3573 | |
################################################################################
|
| 3574 | |
VPATH = @srcdir@
|
| 3575 | |
pkgdatadir = $(datadir)/@PACKAGE@
|
| 3576 | |
-pkglibdir = $(libdir)/@PACKAGE@
|
| 3577 | |
pkgincludedir = $(includedir)/@PACKAGE@
|
| 3578 | |
+pkglibdir = $(libdir)/@PACKAGE@
|
| 3579 | |
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
| 3580 | |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
| 3581 | |
install_sh_DATA = $(install_sh) -c -m 644
|
| 3582 | |
install_sh_PROGRAM = $(install_sh) -c
|
| 3583 | |
@@ -62,6 +64,7 @@
|
| 3584 | |
$(ACLOCAL_M4)
|
| 3585 | |
mkinstalldirs = $(install_sh) -d
|
| 3586 | |
CONFIG_CLEAN_FILES =
|
| 3587 | |
+CONFIG_CLEAN_VPATH_FILES =
|
| 3588 | |
SOURCES =
|
| 3589 | |
DIST_SOURCES =
|
| 3590 | |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
| 3591 | |
@@ -99,6 +102,7 @@
|
| 3592 | |
PACKAGE_NAME = @PACKAGE_NAME@
|
| 3593 | |
PACKAGE_STRING = @PACKAGE_STRING@
|
| 3594 | |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
| 3595 | |
+PACKAGE_URL = @PACKAGE_URL@
|
| 3596 | |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
| 3597 | |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
| 3598 | |
PKG_CONFIG = @PKG_CONFIG@
|
| 3599 | |
@@ -279,14 +283,14 @@
|
| 3600 | |
@for dep in $?; do \
|
| 3601 | |
case '$(am__configure_deps)' in \
|
| 3602 | |
*$$dep*) \
|
| 3603 | |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
|
| 3604 | |
- && exit 0; \
|
| 3605 | |
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
|
| 3606 | |
+ && { if test -f $@; then exit 0; else break; fi; }; \
|
| 3607 | |
exit 1;; \
|
| 3608 | |
esac; \
|
| 3609 | |
done; \
|
| 3610 | |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gnome2-system-admin-guide/Makefile'; \
|
| 3611 | |
- cd $(top_srcdir) && \
|
| 3612 | |
- $(AUTOMAKE) --gnu gnome2-system-admin-guide/Makefile
|
| 3613 | |
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gnome2-system-admin-guide/Makefile'; \
|
| 3614 | |
+ $(am__cd) $(top_srcdir) && \
|
| 3615 | |
+ $(AUTOMAKE) --gnu gnome2-system-admin-guide/Makefile
|
| 3616 | |
.PRECIOUS: Makefile
|
| 3617 | |
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
| 3618 | |
@case '$?' in \
|
| 3619 | |
@@ -304,6 +308,7 @@
|
| 3620 | |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
| 3621 | |
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
| 3622 | |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
| 3623 | |
+$(am__aclocal_m4_deps):
|
| 3624 | |
tags: TAGS
|
| 3625 | |
TAGS:
|
| 3626 | |
|
| 3627 | |
@@ -327,13 +332,17 @@
|
| 3628 | |
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
| 3629 | |
if test -d $$d/$$file; then \
|
| 3630 | |
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
| 3631 | |
+ if test -d "$(distdir)/$$file"; then \
|
| 3632 | |
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
| 3633 | |
+ fi; \
|
| 3634 | |
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
| 3635 | |
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
| 3636 | |
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
| 3637 | |
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
| 3638 | |
fi; \
|
| 3639 | |
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
| 3640 | |
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
| 3641 | |
else \
|
| 3642 | |
- test -f $(distdir)/$$file \
|
| 3643 | |
- || cp -p $$d/$$file $(distdir)/$$file \
|
| 3644 | |
+ test -f "$(distdir)/$$file" \
|
| 3645 | |
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
| 3646 | |
|| exit 1; \
|
| 3647 | |
fi; \
|
| 3648 | |
done
|
| 3649 | |
@@ -364,6 +373,7 @@
|
| 3650 | |
|
| 3651 | |
distclean-generic:
|
| 3652 | |
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
| 3653 | |
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
| 3654 | |
|
| 3655 | |
maintainer-clean-generic:
|
| 3656 | |
@echo "This command is intended for maintainers to use"
|
| 3657 | |
@@ -382,6 +392,8 @@
|
| 3658 | |
|
| 3659 | |
html: html-am
|
| 3660 | |
|
| 3661 | |
+html-am:
|
| 3662 | |
+
|
| 3663 | |
info: info-am
|
| 3664 | |
|
| 3665 | |
info-am:
|
| 3666 | |
@@ -390,18 +402,28 @@
|
| 3667 | |
|
| 3668 | |
install-dvi: install-dvi-am
|
| 3669 | |
|
| 3670 | |
+install-dvi-am:
|
| 3671 | |
+
|
| 3672 | |
install-exec-am:
|
| 3673 | |
|
| 3674 | |
install-html: install-html-am
|
| 3675 | |
|
| 3676 | |
+install-html-am:
|
| 3677 | |
+
|
| 3678 | |
install-info: install-info-am
|
| 3679 | |
|
| 3680 | |
+install-info-am:
|
| 3681 | |
+
|
| 3682 | |
install-man:
|
| 3683 | |
|
| 3684 | |
install-pdf: install-pdf-am
|
| 3685 | |
|
| 3686 | |
+install-pdf-am:
|
| 3687 | |
+
|
| 3688 | |
install-ps: install-ps-am
|
| 3689 | |
|
| 3690 | |
+install-ps-am:
|
| 3691 | |
+
|
| 3692 | |
installcheck-am:
|
| 3693 | |
|
| 3694 | |
maintainer-clean: maintainer-clean-am
|
| 3695 | |
@@ -621,7 +643,7 @@
|
| 3696 | |
rm -f "$$lc/.xml2po.mo"; \
|
| 3697 | |
fi; \
|
| 3698 | |
done
|
| 3699 | |
-clean-doc-dir:
|
| 3700 | |
+clean-doc-dir: clean-doc-lc
|
| 3701 | |
@for lc in C $(_DOC_REAL_LINGUAS); do \
|
| 3702 | |
for dir in `find $$lc -depth -type d`; do \
|
| 3703 | |
if ! test $$dir -ef $(srcdir)/$$dir; then \
|
| 3704 | |
@@ -853,6 +875,7 @@
|
| 3705 | |
$(INSTALL_DATA) "$$spdf" "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$pdf"; \
|
| 3706 | |
fi; \
|
| 3707 | |
done
|
| 3708 | |
+
|
| 3709 | |
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
| 3710 | |
# Otherwise a system limit (for SysV at least) may be exceeded.
|
| 3711 | |
.NOEXPORT:
|
| 3712 | |
diff -Nur -x '*.orig' -x '*~' gnome-user-docs-2.28.0/gnome2-user-guide/Makefile.in gnome-user-docs-2.28.0.new/gnome2-user-guide/Makefile.in
|
| 3713 | |
--- gnome-user-docs-2.28.0/gnome2-user-guide/Makefile.in 2009-09-21 18:33:34.000000000 +0200
|
| 3714 | |
+++ gnome-user-docs-2.28.0.new/gnome2-user-guide/Makefile.in 2009-09-27 23:57:29.648804778 +0200
|
| 3715 | |
@@ -1,8 +1,9 @@
|
| 3716 | |
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
| 3717 | |
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
| 3718 | |
# @configure_input@
|
| 3719 | |
|
| 3720 | |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
| 3721 | |
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
| 3722 | |
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
| 3723 | |
+# Inc.
|
| 3724 | |
# This Makefile.in is free software; the Free Software Foundation
|
| 3725 | |
# gives unlimited permission to copy and/or distribute it,
|
| 3726 | |
# with or without modifications, as long as this notice is preserved.
|
| 3727 | |
@@ -39,8 +40,9 @@
|
| 3728 | |
################################################################################
|
| 3729 | |
VPATH = @srcdir@
|
| 3730 | |
pkgdatadir = $(datadir)/@PACKAGE@
|
| 3731 | |
-pkglibdir = $(libdir)/@PACKAGE@
|
| 3732 | |
pkgincludedir = $(includedir)/@PACKAGE@
|
| 3733 | |
+pkglibdir = $(libdir)/@PACKAGE@
|
| 3734 | |
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
| 3735 | |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
| 3736 | |
install_sh_DATA = $(install_sh) -c -m 644
|
| 3737 | |
install_sh_PROGRAM = $(install_sh) -c
|
| 3738 | |
@@ -62,6 +64,7 @@
|
| 3739 | |
$(ACLOCAL_M4)
|
| 3740 | |
mkinstalldirs = $(install_sh) -d
|
| 3741 | |
CONFIG_CLEAN_FILES =
|
| 3742 | |
+CONFIG_CLEAN_VPATH_FILES =
|
| 3743 | |
SOURCES =
|
| 3744 | |
DIST_SOURCES =
|
| 3745 | |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
| 3746 | |
@@ -99,6 +102,7 @@
|
| 3747 | |
PACKAGE_NAME = @PACKAGE_NAME@
|
| 3748 | |
PACKAGE_STRING = @PACKAGE_STRING@
|
| 3749 | |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
| 3750 | |
+PACKAGE_URL = @PACKAGE_URL@
|
| 3751 | |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
| 3752 | |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
| 3753 | |
PKG_CONFIG = @PKG_CONFIG@
|
| 3754 | |
@@ -276,14 +280,14 @@
|
| 3755 | |
@for dep in $?; do \
|
| 3756 | |
case '$(am__configure_deps)' in \
|
| 3757 | |
*$$dep*) \
|
| 3758 | |
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
|
| 3759 | |
- && exit 0; \
|
| 3760 | |
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
|
| 3761 | |
+ && { if test -f $@; then exit 0; else break; fi; }; \
|
| 3762 | |
exit 1;; \
|
| 3763 | |
esac; \
|
| 3764 | |
done; \
|
| 3765 | |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gnome2-user-guide/Makefile'; \
|
| 3766 | |
- cd $(top_srcdir) && \
|
| 3767 | |
- $(AUTOMAKE) --gnu gnome2-user-guide/Makefile
|
| 3768 | |
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gnome2-user-guide/Makefile'; \
|
| 3769 | |
+ $(am__cd) $(top_srcdir) && \
|
| 3770 | |
+ $(AUTOMAKE) --gnu gnome2-user-guide/Makefile
|
| 3771 | |
.PRECIOUS: Makefile
|
| 3772 | |
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
| 3773 | |
@case '$?' in \
|
| 3774 | |
@@ -301,6 +305,7 @@
|
| 3775 | |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
| 3776 | |
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
| 3777 | |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
| 3778 | |
+$(am__aclocal_m4_deps):
|
| 3779 | |
tags: TAGS
|
| 3780 | |
TAGS:
|
| 3781 | |
|
| 3782 | |
@@ -324,13 +329,17 @@
|
| 3783 | |
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
| 3784 | |
if test -d $$d/$$file; then \
|
| 3785 | |
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
| 3786 | |
+ if test -d "$(distdir)/$$file"; then \
|
| 3787 | |
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
| 3788 | |
+ fi; \
|
| 3789 | |
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
| 3790 | |
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
| 3791 | |
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
| 3792 | |
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
| 3793 | |
fi; \
|
| 3794 | |
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
| 3795 | |
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
| 3796 | |
else \
|
| 3797 | |
- test -f $(distdir)/$$file \
|
| 3798 | |
- || cp -p $$d/$$file $(distdir)/$$file \
|
| 3799 | |
+ test -f "$(distdir)/$$file" \
|
| 3800 | |
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
| 3801 | |
|| exit 1; \
|
| 3802 | |
fi; \
|
| 3803 | |
done
|
| 3804 | |
@@ -361,6 +370,7 @@
|
| 3805 | |
|
| 3806 | |
distclean-generic:
|
| 3807 | |
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
| 3808 | |
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
| 3809 | |
|
| 3810 | |
maintainer-clean-generic:
|
| 3811 | |
@echo "This command is intended for maintainers to use"
|
| 3812 | |
@@ -379,6 +389,8 @@
|
| 3813 | |
|
| 3814 | |
html: html-am
|
| 3815 | |
|
| 3816 | |
+html-am:
|
| 3817 | |
+
|
| 3818 | |
info: info-am
|
| 3819 | |
|
| 3820 | |
info-am:
|
| 3821 | |
@@ -387,18 +399,28 @@
|
| 3822 | |
|
| 3823 | |
install-dvi: install-dvi-am
|
| 3824 | |
|
| 3825 | |
+install-dvi-am:
|
| 3826 | |
+
|
| 3827 | |
install-exec-am:
|
| 3828 | |
|
| 3829 | |
install-html: install-html-am
|
| 3830 | |
|
| 3831 | |
+install-html-am:
|
| 3832 | |
+
|
| 3833 | |
install-info: install-info-am
|
| 3834 | |
|
| 3835 | |
+install-info-am:
|
| 3836 | |
+
|
| 3837 | |
install-man:
|
| 3838 | |
|
| 3839 | |
install-pdf: install-pdf-am
|
| 3840 | |
|
| 3841 | |
+install-pdf-am:
|
| 3842 | |
+
|
| 3843 | |
install-ps: install-ps-am
|
| 3844 | |
|
| 3845 | |
+install-ps-am:
|
| 3846 | |
+
|
| 3847 | |
installcheck-am:
|
| 3848 | |
|
| 3849 | |
maintainer-clean: maintainer-clean-am
|
| 3850 | |
@@ -618,7 +640,7 @@
|
| 3851 | |
rm -f "$$lc/.xml2po.mo"; \
|
| 3852 | |
fi; \
|
| 3853 | |
done
|
| 3854 | |
-clean-doc-dir:
|
| 3855 | |
+clean-doc-dir: clean-doc-lc
|
| 3856 | |
@for lc in C $(_DOC_REAL_LINGUAS); do \
|
| 3857 | |
for dir in `find $$lc -depth -type d`; do \
|
| 3858 | |
if ! test $$dir -ef $(srcdir)/$$dir; then \
|
| 3859 | |
@@ -850,6 +872,7 @@
|
| 3860 | |
$(INSTALL_DATA) "$$spdf" "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$pdf"; \
|
| 3861 | |
fi; \
|
| 3862 | |
done
|
| 3863 | |
+
|
| 3864 | |
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
| 3865 | |
# Otherwise a system limit (for SysV at least) may be exceeded.
|
| 3866 | |
.NOEXPORT:
|
| 3867 | |
diff -Nur -x '*.orig' -x '*~' gnome-user-docs-2.28.0/gnome-doc-utils.make gnome-user-docs-2.28.0.new/gnome-doc-utils.make
|
| 3868 | |
--- gnome-user-docs-2.28.0/gnome-doc-utils.make 2009-09-21 18:33:32.000000000 +0200
|
| 3869 | |
+++ gnome-user-docs-2.28.0.new/gnome-doc-utils.make 2009-09-27 23:57:11.200818178 +0200
|
| 3870 | |
@@ -398,7 +398,7 @@
|
| 3871 | |
rm -f "$$lc/.xml2po.mo"; \
|
| 3872 | |
fi; \
|
| 3873 | |
done
|
| 3874 | |
-clean-doc-dir:
|
| 3875 | |
+clean-doc-dir: clean-doc-lc
|
| 3876 | |
@for lc in C $(_DOC_REAL_LINGUAS); do \
|
| 3877 | |
for dir in `find $$lc -depth -type d`; do \
|
| 3878 | |
if ! test $$dir -ef $(srcdir)/$$dir; then \
|
| 3879 | |
diff -Nur -x '*.orig' -x '*~' gnome-user-docs-2.28.0/INSTALL gnome-user-docs-2.28.0.new/INSTALL
|
| 3880 | |
--- gnome-user-docs-2.28.0/INSTALL 2009-09-21 18:33:34.000000000 +0200
|
| 3881 | |
+++ gnome-user-docs-2.28.0.new/INSTALL 2009-09-27 23:57:29.708801586 +0200
|
| 3882 | |
@@ -2,15 +2,15 @@
|
| 3883 | |
*************************
|
| 3884 | |
|
| 3885 | |
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
| 3886 | |
-2006, 2007 Free Software Foundation, Inc.
|
| 3887 | |
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
| 3888 | |
|
| 3889 | |
-This file is free documentation; the Free Software Foundation gives
|
| 3890 | |
+ This file is free documentation; the Free Software Foundation gives
|
| 3891 | |
unlimited permission to copy, distribute and modify it.
|
| 3892 | |
|
| 3893 | |
Basic Installation
|
| 3894 | |
==================
|
| 3895 | |
|
| 3896 | |
-Briefly, the shell commands `./configure; make; make install' should
|
| 3897 | |
+ Briefly, the shell commands `./configure; make; make install' should
|
| 3898 | |
configure, build, and install this package. The following
|
| 3899 | |
more-detailed instructions are generic; see the `README' file for
|
| 3900 | |
instructions specific to this package.
|
| 3901 | |
@@ -73,9 +73,9 @@
|
| 3902 | |
Compilers and Options
|
| 3903 | |
=====================
|
| 3904 | |
|
| 3905 | |
-Some systems require unusual options for compilation or linking that the
|
| 3906 | |
-`configure' script does not know about. Run `./configure --help' for
|
| 3907 | |
-details on some of the pertinent environment variables.
|
| 3908 | |
+ Some systems require unusual options for compilation or linking that
|
| 3909 | |
+the `configure' script does not know about. Run `./configure --help'
|
| 3910 | |
+for details on some of the pertinent environment variables.
|
| 3911 | |
|
| 3912 | |
You can give `configure' initial values for configuration parameters
|
| 3913 | |
by setting variables in the command line or in the environment. Here
|
| 3914 | |
@@ -88,7 +88,7 @@
|
| 3915 | |
Compiling For Multiple Architectures
|
| 3916 | |
====================================
|
| 3917 | |
|
| 3918 | |
-You can compile the package for more than one kind of computer at the
|
| 3919 | |
+ You can compile the package for more than one kind of computer at the
|
| 3920 | |
same time, by placing the object files for each architecture in their
|
| 3921 | |
own directory. To do this, you can use GNU `make'. `cd' to the
|
| 3922 | |
directory where you want the object files and executables to go and run
|
| 3923 | |
@@ -100,10 +100,24 @@
|
| 3924 | |
installed the package for one architecture, use `make distclean' before
|
| 3925 | |
reconfiguring for another architecture.
|
| 3926 | |
|
| 3927 | |
+ On MacOS X 10.5 and later systems, you can create libraries and
|
| 3928 | |
+executables that work on multiple system types--known as "fat" or
|
| 3929 | |
+"universal" binaries--by specifying multiple `-arch' options to the
|
| 3930 | |
+compiler but only a single `-arch' option to the preprocessor. Like
|
| 3931 | |
+this:
|
| 3932 | |
+
|
| 3933 | |
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
| 3934 | |
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
| 3935 | |
+ CPP="gcc -E" CXXCPP="g++ -E"
|
| 3936 | |
+
|
| 3937 | |
+ This is not guaranteed to produce working output in all cases, you
|
| 3938 | |
+may have to build one architecture at a time and combine the results
|
| 3939 | |
+using the `lipo' tool if you have problems.
|
| 3940 | |
+
|
| 3941 | |
Installation Names
|
| 3942 | |
==================
|
| 3943 | |
|
| 3944 | |
-By default, `make install' installs the package's commands under
|
| 3945 | |
+ By default, `make install' installs the package's commands under
|
| 3946 | |
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
| 3947 | |
can specify an installation prefix other than `/usr/local' by giving
|
| 3948 | |
`configure' the option `--prefix=PREFIX'.
|
| 3949 | |
@@ -126,7 +140,7 @@
|
| 3950 | |
Optional Features
|
| 3951 | |
=================
|
| 3952 | |
|
| 3953 | |
-Some packages pay attention to `--enable-FEATURE' options to
|
| 3954 | |
+ Some packages pay attention to `--enable-FEATURE' options to
|
| 3955 | |
`configure', where FEATURE indicates an optional part of the package.
|
| 3956 | |
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
| 3957 | |
is something like `gnu-as' or `x' (for the X Window System). The
|
| 3958 | |
@@ -138,14 +152,46 @@
|
| 3959 | |
you can use the `configure' options `--x-includes=DIR' and
|
| 3960 | |
`--x-libraries=DIR' to specify their locations.
|
| 3961 | |
|
| 3962 | |
+Particular systems
|
| 3963 | |
+==================
|
| 3964 | |
+
|
| 3965 | |
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
| 3966 | |
+CC is not installed, it is recommended to use the following options in
|
| 3967 | |
+order to use an ANSI C compiler:
|
| 3968 | |
+
|
| 3969 | |
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
|
| 3970 | |
+
|
| 3971 | |
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
| 3972 | |
+
|
| 3973 | |
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
| 3974 | |
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
| 3975 | |
+a workaround. If GNU CC is not installed, it is therefore recommended
|
| 3976 | |
+to try
|
| 3977 | |
+
|
| 3978 | |
+ ./configure CC="cc"
|
| 3979 | |
+
|
| 3980 | |
+and if that doesn't work, try
|
| 3981 | |
+
|
| 3982 | |
+ ./configure CC="cc -nodtk"
|
| 3983 | |
+
|
| 3984 | |
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
|
| 3985 | |
+directory contains several dysfunctional programs; working variants of
|
| 3986 | |
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
|
| 3987 | |
+in your `PATH', put it _after_ `/usr/bin'.
|
| 3988 | |
+
|
| 3989 | |
+ On Haiku, software installed for all users goes in `/boot/common',
|
| 3990 | |
+not `/usr/local'. It is recommended to use the following options:
|
| 3991 | |
+
|
| 3992 | |
+ ./configure --prefix=/boot/common
|
| 3993 | |
+
|
| 3994 | |
Specifying the System Type
|
| 3995 | |
==========================
|
| 3996 | |
|
| 3997 | |
-There may be some features `configure' cannot figure out automatically,
|
| 3998 | |
-but needs to determine by the type of machine the package will run on.
|
| 3999 | |
-Usually, assuming the package is built to be run on the _same_
|
| 4000 | |
-architectures, `configure' can figure that out, but if it prints a
|
| 4001 | |
-message saying it cannot guess the machine type, give it the
|
| 4002 | |
+ There may be some features `configure' cannot figure out
|
| 4003 | |
+automatically, but needs to determine by the type of machine the package
|
| 4004 | |
+will run on. Usually, assuming the package is built to be run on the
|
| 4005 | |
+_same_ architectures, `configure' can figure that out, but if it prints
|
| 4006 | |
+a message saying it cannot guess the machine type, give it the
|
| 4007 | |
`--build=TYPE' option. TYPE can either be a short name for the system
|
| 4008 | |
type, such as `sun4', or a canonical name which has the form:
|
| 4009 | |
|
| 4010 | |
@@ -153,7 +199,8 @@
|
| 4011 | |
|
| 4012 | |
where SYSTEM can have one of these forms:
|
| 4013 | |
|
| 4014 | |
- OS KERNEL-OS
|
| 4015 | |
+ OS
|
| 4016 | |
+ KERNEL-OS
|
| 4017 | |
|
| 4018 | |
See the file `config.sub' for the possible values of each field. If
|
| 4019 | |
`config.sub' isn't included in this package, then this package doesn't
|
| 4020 | |
@@ -171,9 +218,9 @@
|
| 4021 | |
Sharing Defaults
|
| 4022 | |
================
|
| 4023 | |
|
| 4024 | |
-If you want to set default values for `configure' scripts to share, you
|
| 4025 | |
-can create a site shell script called `config.site' that gives default
|
| 4026 | |
-values for variables like `CC', `cache_file', and `prefix'.
|
| 4027 | |
+ If you want to set default values for `configure' scripts to share,
|
| 4028 | |
+you can create a site shell script called `config.site' that gives
|
| 4029 | |
+default values for variables like `CC', `cache_file', and `prefix'.
|
| 4030 | |
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
| 4031 | |
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
| 4032 | |
`CONFIG_SITE' environment variable to the location of the site script.
|
| 4033 | |
@@ -182,7 +229,7 @@
|
| 4034 | |
Defining Variables
|
| 4035 | |
==================
|
| 4036 | |
|
| 4037 | |
-Variables not defined in a site shell script can be set in the
|
| 4038 | |
+ Variables not defined in a site shell script can be set in the
|
| 4039 | |
environment passed to `configure'. However, some packages may run
|
| 4040 | |
configure again during the build, and the customized values of these
|
| 4041 | |
variables may be lost. In order to avoid this problem, you should set
|
| 4042 | |
@@ -201,11 +248,19 @@
|
| 4043 | |
`configure' Invocation
|
| 4044 | |
======================
|
| 4045 | |
|
| 4046 | |
-`configure' recognizes the following options to control how it operates.
|
| 4047 | |
+ `configure' recognizes the following options to control how it
|
| 4048 | |
+operates.
|
| 4049 | |
|
| 4050 | |
`--help'
|
| 4051 | |
`-h'
|
| 4052 | |
- Print a summary of the options to `configure', and exit.
|
| 4053 | |
+ Print a summary of all of the options to `configure', and exit.
|
| 4054 | |
+
|
| 4055 | |
+`--help=short'
|
| 4056 | |
+`--help=recursive'
|
| 4057 | |
+ Print a summary of the options unique to this package's
|
| 4058 | |
+ `configure', and exit. The `short' variant lists options used
|
| 4059 | |
+ only in the top level, while the `recursive' variant lists options
|
| 4060 | |
+ also present in any nested packages.
|
| 4061 | |
|
| 4062 | |
`--version'
|
| 4063 | |
`-V'
|
| 4064 | |
@@ -232,6 +287,16 @@
|
| 4065 | |
Look for the package's source code in directory DIR. Usually
|
| 4066 | |
`configure' can determine that directory automatically.
|
| 4067 | |
|
| 4068 | |
+`--prefix=DIR'
|
| 4069 | |
+ Use DIR as the installation prefix. *Note Installation Names::
|
| 4070 | |
+ for more details, including other options available for fine-tuning
|
| 4071 | |
+ the installation locations.
|
| 4072 | |
+
|
| 4073 | |
+`--no-create'
|
| 4074 | |
+`-n'
|
| 4075 | |
+ Run the configure checks, but stop before creating any output
|
| 4076 | |
+ files.
|
| 4077 | |
+
|
| 4078 | |
`configure' also accepts some other, not widely useful, options. Run
|
| 4079 | |
`configure --help' for more details.
|
| 4080 | |
|
| 4081 | |
diff -Nur -x '*.orig' -x '*~' gnome-user-docs-2.28.0/install-sh gnome-user-docs-2.28.0.new/install-sh
|
| 4082 | |
--- gnome-user-docs-2.28.0/install-sh 2009-09-21 18:33:33.000000000 +0200
|
| 4083 | |
+++ gnome-user-docs-2.28.0.new/install-sh 2009-09-27 23:57:28.768801231 +0200
|
| 4084 | |
@@ -1,7 +1,7 @@
|
| 4085 | |
#!/bin/sh
|
| 4086 | |
# install - install a program, script, or datafile
|
| 4087 | |
|
| 4088 | |
-scriptversion=2006-12-25.00
|
| 4089 | |
+scriptversion=2009-04-28.21; # UTC
|
| 4090 | |
|
| 4091 | |
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
| 4092 | |
# later released in X11R6 (xc/config/util/install.sh) with the
|
| 4093 | |
@@ -515,5 +515,6 @@
|
| 4094 | |
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
| 4095 | |
# time-stamp-start: "scriptversion="
|
| 4096 | |
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
| 4097 | |
-# time-stamp-end: "$"
|
| 4098 | |
+# time-stamp-time-zone: "UTC"
|
| 4099 | |
+# time-stamp-end: "; # UTC"
|
| 4100 | |
# End:
|
| 4101 | |
diff -Nur -x '*.orig' -x '*~' gnome-user-docs-2.28.0/Makefile.in gnome-user-docs-2.28.0.new/Makefile.in
|
| 4102 | |
--- gnome-user-docs-2.28.0/Makefile.in 2009-09-21 18:33:34.000000000 +0200
|
| 4103 | |
+++ gnome-user-docs-2.28.0.new/Makefile.in 2009-09-27 23:57:29.864802191 +0200
|
| 4104 | |
@@ -1,8 +1,9 @@
|
| 4105 | |
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
| 4106 | |
+# Makefile.in generated by automake 1.11 from Makefile.am.
|
| 4107 | |
# @configure_input@
|
| 4108 | |
|
| 4109 | |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
| 4110 | |
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
| 4111 | |
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
| 4112 | |
+# Inc.
|
| 4113 | |
# This Makefile.in is free software; the Free Software Foundation
|
| 4114 | |
# gives unlimited permission to copy and/or distribute it,
|
| 4115 | |
# with or without modifications, as long as this notice is preserved.
|
| 4116 | |
@@ -15,8 +16,9 @@
|
| 4117 | |
@SET_MAKE@
|
| 4118 | |
VPATH = @srcdir@
|
| 4119 | |
pkgdatadir = $(datadir)/@PACKAGE@
|
| 4120 | |
-pkglibdir = $(libdir)/@PACKAGE@
|
| 4121 | |
pkgincludedir = $(includedir)/@PACKAGE@
|
| 4122 | |
+pkglibdir = $(libdir)/@PACKAGE@
|
| 4123 | |
+pkglibexecdir = $(libexecdir)/@PACKAGE@
|
| 4124 | |
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
| 4125 | |
install_sh_DATA = $(install_sh) -c -m 644
|
| 4126 | |
install_sh_PROGRAM = $(install_sh) -c
|
| 4127 | |
@@ -42,6 +44,7 @@
|
| 4128 | |
configure.lineno config.status.lineno
|
| 4129 | |
mkinstalldirs = $(install_sh) -d
|
| 4130 | |
CONFIG_CLEAN_FILES = gnome-user-docs.spec
|
| 4131 | |
+CONFIG_CLEAN_VPATH_FILES =
|
| 4132 | |
SOURCES =
|
| 4133 | |
DIST_SOURCES =
|
| 4134 | |
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
| 4135 | |
@@ -53,6 +56,9 @@
|
| 4136 | |
ps-recursive uninstall-recursive
|
| 4137 | |
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
| 4138 | |
distclean-recursive maintainer-clean-recursive
|
| 4139 | |
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
| 4140 | |
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
|
| 4141 | |
+ distdir dist dist-all distcheck
|
| 4142 | |
ETAGS = etags
|
| 4143 | |
CTAGS = ctags
|
| 4144 | |
DIST_SUBDIRS = $(SUBDIRS)
|
| 4145 | |
@@ -60,9 +66,34 @@
|
| 4146 | |
distdir = $(PACKAGE)-$(VERSION)
|
| 4147 | |
top_distdir = $(distdir)
|
| 4148 | |
am__remove_distdir = \
|
| 4149 | |
- { test ! -d $(distdir) \
|
| 4150 | |
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
|
| 4151 | |
- && rm -fr $(distdir); }; }
|
| 4152 | |
+ { test ! -d "$(distdir)" \
|
| 4153 | |
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
|
| 4154 | |
+ && rm -fr "$(distdir)"; }; }
|
| 4155 | |
+am__relativize = \
|
| 4156 | |
+ dir0=`pwd`; \
|
| 4157 | |
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
|
| 4158 | |
+ sed_rest='s,^[^/]*/*,,'; \
|
| 4159 | |
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
|
| 4160 | |
+ sed_butlast='s,/*[^/]*$$,,'; \
|
| 4161 | |
+ while test -n "$$dir1"; do \
|
| 4162 | |
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
|
| 4163 | |
+ if test "$$first" != "."; then \
|
| 4164 | |
+ if test "$$first" = ".."; then \
|
| 4165 | |
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
|
| 4166 | |
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
|
| 4167 | |
+ else \
|
| 4168 | |
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
|
| 4169 | |
+ if test "$$first2" = "$$first"; then \
|
| 4170 | |
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
|
| 4171 | |
+ else \
|
| 4172 | |
+ dir2="../$$dir2"; \
|
| 4173 | |
+ fi; \
|
| 4174 | |
+ dir0="$$dir0"/"$$first"; \
|
| 4175 | |
+ fi; \
|
| 4176 | |
+ fi; \
|
| 4177 | |
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
| 4178 | |
+ done; \
|
| 4179 | |
+ reldir="$$dir2"
|
| 4180 | |
DIST_ARCHIVES = $(distdir).tar.gz
|
| 4181 | |
GZIP_ENV = --best
|
| 4182 | |
distuninstallcheck_listfiles = find . -type f -print
|
| 4183 | |
@@ -101,6 +132,7 @@
|
| 4184 | |
PACKAGE_NAME = @PACKAGE_NAME@
|
| 4185 | |
PACKAGE_STRING = @PACKAGE_STRING@
|
| 4186 | |
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
| 4187 | |
+PACKAGE_URL = @PACKAGE_URL@
|
| 4188 | |
PACKAGE_VERSION = @PACKAGE_VERSION@
|
| 4189 | |
PATH_SEPARATOR = @PATH_SEPARATOR@
|
| 4190 | |
PKG_CONFIG = @PKG_CONFIG@
|
| 4191 | |
@@ -163,15 +195,15 @@
|
| 4192 | |
@for dep in $?; do \
|
| 4193 | |
case '$(am__configure_deps)' in \
|
| 4194 | |
*$$dep*) \
|
| 4195 | |
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
|
| 4196 | |
- cd $(srcdir) && $(AUTOMAKE) --gnu \
|
| 4197 | |
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
|
| 4198 | |
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
|
| 4199 | |
&& exit 0; \
|
| 4200 | |
exit 1;; \
|
| 4201 | |
esac; \
|
| 4202 | |
done; \
|
| 4203 | |
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
|
| 4204 | |
- cd $(top_srcdir) && \
|
| 4205 | |
- $(AUTOMAKE) --gnu Makefile
|
| 4206 | |
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
|
| 4207 | |
+ $(am__cd) $(top_srcdir) && \
|
| 4208 | |
+ $(AUTOMAKE) --gnu Makefile
|
| 4209 | |
.PRECIOUS: Makefile
|
| 4210 | |
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
| 4211 | |
@case '$?' in \
|
| 4212 | |
@@ -187,9 +219,10 @@
|
| 4213 | |
$(SHELL) ./config.status --recheck
|
| 4214 | |
|
| 4215 | |
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
| 4216 | |
- cd $(srcdir) && $(AUTOCONF)
|
| 4217 | |
+ $(am__cd) $(srcdir) && $(AUTOCONF)
|
| 4218 | |
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
| 4219 | |
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
| 4220 | |
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
| 4221 | |
+$(am__aclocal_m4_deps):
|
| 4222 | |
gnome-user-docs.spec: $(top_builddir)/config.status $(srcdir)/gnome-user-docs.spec.in
|
| 4223 | |
cd $(top_builddir) && $(SHELL) ./config.status $@
|
| 4224 | |
|
| 4225 | |
@@ -217,7 +250,7 @@
|
| 4226 | |
else \
|
| 4227 | |
local_target="$$target"; \
|
| 4228 | |
fi; \
|
| 4229 | |
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
| 4230 | |
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
| 4231 | |
|| eval $$failcom; \
|
| 4232 | |
done; \
|
| 4233 | |
if test "$$dot_seen" = "no"; then \
|
| 4234 | |
@@ -251,16 +284,16 @@
|
| 4235 | |
else \
|
| 4236 | |
local_target="$$target"; \
|
| 4237 | |
fi; \
|
| 4238 | |
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
| 4239 | |
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
| 4240 | |
|| eval $$failcom; \
|
| 4241 | |
done && test -z "$$fail"
|
| 4242 | |
tags-recursive:
|
| 4243 | |
list='$(SUBDIRS)'; for subdir in $$list; do \
|
| 4244 | |
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
| 4245 | |
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
| 4246 | |
done
|
| 4247 | |
ctags-recursive:
|
| 4248 | |
list='$(SUBDIRS)'; for subdir in $$list; do \
|
| 4249 | |
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
| 4250 | |
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
| 4251 | |
done
|
| 4252 | |
|
| 4253 | |
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
| 4254 | |
@@ -268,14 +301,14 @@
|
| 4255 | |
unique=`for i in $$list; do \
|
| 4256 | |
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
| 4257 | |
done | \
|
| 4258 | |
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
|
| 4259 | |
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
| 4260 | |
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
| 4261 | |
mkid -fID $$unique
|
| 4262 | |
tags: TAGS
|
| 4263 | |
|
| 4264 | |
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
| 4265 | |
$(TAGS_FILES) $(LISP)
|
| 4266 | |
- tags=; \
|
| 4267 | |
+ set x; \
|
| 4268 | |
here=`pwd`; \
|
| 4269 | |
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
| 4270 | |
include_option=--etags-include; \
|
| 4271 | |
@@ -287,7 +320,7 @@
|
| 4272 | |
list='$(SUBDIRS)'; for subdir in $$list; do \
|
| 4273 | |
if test "$$subdir" = .; then :; else \
|
| 4274 | |
test ! -f $$subdir/TAGS || \
|
| 4275 | |
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
|
| 4276 | |
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
|
| 4277 | |
fi; \
|
| 4278 | |
done; \
|
| 4279 | |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
| 4280 | |
@@ -296,36 +329,41 @@
|
| 4281 | |
done | \
|
| 4282 | |
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
| 4283 | |
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
| 4284 | |
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
| 4285 | |
+ shift; \
|
| 4286 | |
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
| 4287 | |
test -n "$$unique" || unique=$$empty_fix; \
|
| 4288 | |
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
| 4289 | |
- $$tags $$unique; \
|
| 4290 | |
+ if test $$# -gt 0; then \
|
| 4291 | |
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
| 4292 | |
+ "$$@" $$unique; \
|
| 4293 | |
+ else \
|
| 4294 | |
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
| 4295 | |
+ $$unique; \
|
| 4296 | |
+ fi; \
|
| 4297 | |
fi
|
| 4298 | |
ctags: CTAGS
|
| 4299 | |
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
| 4300 | |
$(TAGS_FILES) $(LISP)
|
| 4301 | |
- tags=; \
|
| 4302 | |
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
| 4303 | |
unique=`for i in $$list; do \
|
| 4304 | |
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
| 4305 | |
done | \
|
| 4306 | |
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
| 4307 | |
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
| 4308 | |
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
| 4309 | |
+ test -z "$(CTAGS_ARGS)$$unique" \
|
| 4310 | |
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
| 4311 | |
- $$tags $$unique
|
| 4312 | |
+ $$unique
|
| 4313 | |
|
| 4314 | |
GTAGS:
|
| 4315 | |
here=`$(am__cd) $(top_builddir) && pwd` \
|
| 4316 | |
- && cd $(top_srcdir) \
|
| 4317 | |
- && gtags -i $(GTAGS_ARGS) $$here
|
| 4318 | |
+ && $(am__cd) $(top_srcdir) \
|
| 4319 | |
+ && gtags -i $(GTAGS_ARGS) "$$here"
|
| 4320 | |
|
| 4321 | |
distclean-tags:
|
| 4322 | |
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
| 4323 | |
|
| 4324 | |
distdir: $(DISTFILES)
|
| 4325 | |
$(am__remove_distdir)
|
| 4326 | |
- test -d $(distdir) || mkdir $(distdir)
|
| 4327 | |
+ test -d "$(distdir)" || mkdir "$(distdir)"
|
| 4328 | |
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
| 4329 | |
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
| 4330 | |
list='$(DISTFILES)'; \
|
| 4331 | |
@@ -341,38 +379,54 @@
|
| 4332 | |
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
| 4333 | |
if test -d $$d/$$file; then \
|
| 4334 | |
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
| 4335 | |
+ if test -d "$(distdir)/$$file"; then \
|
| 4336 | |
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
| 4337 | |
+ fi; \
|
| 4338 | |
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
| 4339 | |
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
|
| 4340 | |
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
| 4341 | |
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
| 4342 | |
fi; \
|
| 4343 | |
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
|
| 4344 | |
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
| 4345 | |
else \
|
| 4346 | |
- test -f $(distdir)/$$file \
|
| 4347 | |
- || cp -p $$d/$$file $(distdir)/$$file \
|
| 4348 | |
+ test -f "$(distdir)/$$file" \
|
| 4349 | |
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|
| 4350 | |
|| exit 1; \
|
| 4351 | |
fi; \
|
| 4352 | |
done
|
| 4353 | |
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
| 4354 | |
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
| 4355 | |
if test "$$subdir" = .; then :; else \
|
| 4356 | |
test -d "$(distdir)/$$subdir" \
|
| 4357 | |
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|
| 4358 | |
|| exit 1; \
|
| 4359 | |
- distdir=`$(am__cd) $(distdir) && pwd`; \
|
| 4360 | |
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
|
| 4361 | |
- (cd $$subdir && \
|
| 4362 | |
+ fi; \
|
| 4363 | |
+ done
|
| 4364 | |
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
| 4365 | |
+ if test "$$subdir" = .; then :; else \
|
| 4366 | |
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
|
| 4367 | |
+ $(am__relativize); \
|
| 4368 | |
+ new_distdir=$$reldir; \
|
| 4369 | |
+ dir1=$$subdir; dir2="$(top_distdir)"; \
|
| 4370 | |
+ $(am__relativize); \
|
| 4371 | |
+ new_top_distdir=$$reldir; \
|
| 4372 | |
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
|
| 4373 | |
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
|
| 4374 | |
+ ($(am__cd) $$subdir && \
|
| 4375 | |
$(MAKE) $(AM_MAKEFLAGS) \
|
| 4376 | |
- top_distdir="$$top_distdir" \
|
| 4377 | |
- distdir="$$distdir/$$subdir" \
|
| 4378 | |
+ top_distdir="$$new_top_distdir" \
|
| 4379 | |
+ distdir="$$new_distdir" \
|
| 4380 | |
am__remove_distdir=: \
|
| 4381 | |
am__skip_length_check=: \
|
| 4382 | |
+ am__skip_mode_fix=: \
|
| 4383 | |
distdir) \
|
| 4384 | |
|| exit 1; \
|
| 4385 | |
fi; \
|
| 4386 | |
done
|
| 4387 | |
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
| 4388 | |
+ -test -n "$(am__skip_mode_fix)" \
|
| 4389 | |
+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
| 4390 | |
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
| 4391 | |
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
| 4392 | |
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
| 4393 | |
- || chmod -R a+r $(distdir)
|
| 4394 | |
+ || chmod -R a+r "$(distdir)"
|
| 4395 | |
dist-gzip: distdir
|
| 4396 | |
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
| 4397 | |
$(am__remove_distdir)
|
| 4398 | |
@@ -385,6 +439,10 @@
|
| 4399 | |
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
|
| 4400 | |
$(am__remove_distdir)
|
| 4401 | |
|
| 4402 | |
+dist-xz: distdir
|
| 4403 | |
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
|
| 4404 | |
+ $(am__remove_distdir)
|
| 4405 | |
+
|
| 4406 | |
dist-tarZ: distdir
|
| 4407 | |
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
| 4408 | |
$(am__remove_distdir)
|
| 4409 | |
@@ -413,6 +471,8 @@
|
| 4410 | |
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
| 4411 | |
*.tar.lzma*) \
|
| 4412 | |
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
|
| 4413 | |
+ *.tar.xz*) \
|
| 4414 | |
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
| 4415 | |
*.tar.Z*) \
|
| 4416 | |
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
| 4417 | |
*.shar.gz*) \
|
| 4418 | |
@@ -424,9 +484,11 @@
|
| 4419 | |
mkdir $(distdir)/_build
|
| 4420 | |
mkdir $(distdir)/_inst
|
| 4421 | |
chmod a-w $(distdir)
|
| 4422 | |
+ test -d $(distdir)/_build || exit 0; \
|
| 4423 | |
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
|
| 4424 | |
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
|
| 4425 | |
- && cd $(distdir)/_build \
|
| 4426 | |
+ && am__cwd=`pwd` \
|
| 4427 | |
+ && $(am__cd) $(distdir)/_build \
|
| 4428 | |
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
|
| 4429 | |
$(DISTCHECK_CONFIGURE_FLAGS) \
|
| 4430 | |
&& $(MAKE) $(AM_MAKEFLAGS) \
|
| 4431 | |
@@ -448,13 +510,15 @@
|
| 4432 | |
&& rm -rf "$$dc_destdir" \
|
| 4433 | |
&& $(MAKE) $(AM_MAKEFLAGS) dist \
|
| 4434 | |
&& rm -rf $(DIST_ARCHIVES) \
|
| 4435 | |
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
|
| 4436 | |
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
|
| 4437 | |
+ && cd "$$am__cwd" \
|
| 4438 | |
+ || exit 1
|
| 4439 | |
$(am__remove_distdir)
|
| 4440 | |
@(echo "$(distdir) archives ready for distribution: "; \
|
| 4441 | |
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
|
| 4442 | |
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
|
| 4443 | |
distuninstallcheck:
|
| 4444 | |
- @cd $(distuninstallcheck_dir) \
|
| 4445 | |
+ @$(am__cd) '$(distuninstallcheck_dir)' \
|
| 4446 | |
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|
| 4447 | |
|| { echo "ERROR: files left after uninstall:" ; \
|
| 4448 | |
if test -n "$(DESTDIR)"; then \
|
| 4449 | |
@@ -496,6 +560,7 @@
|
| 4450 | |
|
| 4451 | |
distclean-generic:
|
| 4452 | |
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
| 4453 | |
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
| 4454 | |
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
|
| 4455 | |
|
| 4456 | |
maintainer-clean-generic:
|
| 4457 | |
@@ -516,6 +581,8 @@
|
| 4458 | |
|
| 4459 | |
html: html-recursive
|
| 4460 | |
|
| 4461 | |
+html-am:
|
| 4462 | |
+
|
| 4463 | |
info: info-recursive
|
| 4464 | |
|
| 4465 | |
info-am:
|
| 4466 | |
@@ -524,18 +591,28 @@
|
| 4467 | |
|
| 4468 | |
install-dvi: install-dvi-recursive
|
| 4469 | |
|
| 4470 | |
+install-dvi-am:
|
| 4471 | |
+
|
| 4472 | |
install-exec-am:
|
| 4473 | |
|
| 4474 | |
install-html: install-html-recursive
|
| 4475 | |
|
| 4476 | |
+install-html-am:
|
| 4477 | |
+
|
| 4478 | |
install-info: install-info-recursive
|
| 4479 | |
|
| 4480 | |
+install-info-am:
|
| 4481 | |
+
|
| 4482 | |
install-man:
|
| 4483 | |
|
| 4484 | |
install-pdf: install-pdf-recursive
|
| 4485 | |
|
| 4486 | |
+install-pdf-am:
|
| 4487 | |
+
|
| 4488 | |
install-ps: install-ps-recursive
|
| 4489 | |
|
| 4490 | |
+install-ps-am:
|
| 4491 | |
+
|
| 4492 | |
installcheck-am:
|
| 4493 | |
|
| 4494 | |
maintainer-clean: maintainer-clean-recursive
|
| 4495 | |
@@ -558,23 +635,24 @@
|
| 4496 | |
|
| 4497 | |
uninstall-am:
|
| 4498 | |
|
| 4499 | |
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
|
| 4500 | |
- install-strip
|
| 4501 | |
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
|
| 4502 | |
+ install-am install-strip tags-recursive
|
| 4503 | |
|
| 4504 | |
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
|
| 4505 | |
all all-am am--refresh check check-am clean clean-generic \
|
| 4506 | |
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
|
| 4507 | |
- dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
|
| 4508 | |
- distclean-generic distclean-tags distcleancheck distdir \
|
| 4509 | |
- distuninstallcheck dvi dvi-am html html-am info info-am \
|
| 4510 | |
- install install-am install-data install-data-am install-dvi \
|
| 4511 | |
- install-dvi-am install-exec install-exec-am install-html \
|
| 4512 | |
- install-html-am install-info install-info-am install-man \
|
| 4513 | |
- install-pdf install-pdf-am install-ps install-ps-am \
|
| 4514 | |
- install-strip installcheck installcheck-am installdirs \
|
| 4515 | |
- installdirs-am maintainer-clean maintainer-clean-generic \
|
| 4516 | |
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
|
| 4517 | |
- tags-recursive uninstall uninstall-am
|
| 4518 | |
+ dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
|
| 4519 | |
+ distclean distclean-generic distclean-tags distcleancheck \
|
| 4520 | |
+ distdir distuninstallcheck dvi dvi-am html html-am info \
|
| 4521 | |
+ info-am install install-am install-data install-data-am \
|
| 4522 | |
+ install-dvi install-dvi-am install-exec install-exec-am \
|
| 4523 | |
+ install-html install-html-am install-info install-info-am \
|
| 4524 | |
+ install-man install-pdf install-pdf-am install-ps \
|
| 4525 | |
+ install-ps-am install-strip installcheck installcheck-am \
|
| 4526 | |
+ installdirs installdirs-am maintainer-clean \
|
| 4527 | |
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
|
| 4528 | |
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
|
| 4529 | |
+
|
| 4530 | |
|
| 4531 | |
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
| 4532 | |
# Otherwise a system limit (for SysV at least) may be exceeded.
|
| 4533 | |
diff -Nur -x '*.orig' -x '*~' gnome-user-docs-2.28.0/missing gnome-user-docs-2.28.0.new/missing
|
| 4534 | |
--- gnome-user-docs-2.28.0/missing 2009-09-21 18:33:33.000000000 +0200
|
| 4535 | |
+++ gnome-user-docs-2.28.0.new/missing 2009-09-27 23:57:28.772816095 +0200
|
| 4536 | |
@@ -1,10 +1,10 @@
|
| 4537 | |
#! /bin/sh
|
| 4538 | |
# Common stub for a few missing GNU programs while installing.
|
| 4539 | |
|
| 4540 | |
-scriptversion=2006-05-10.23
|
| 4541 | |
+scriptversion=2009-04-28.21; # UTC
|
| 4542 | |
|
| 4543 | |
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
|
| 4544 | |
-# Free Software Foundation, Inc.
|
| 4545 | |
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
|
| 4546 | |
+# 2008, 2009 Free Software Foundation, Inc.
|
| 4547 | |
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
| 4548 | |
|
| 4549 | |
# This program is free software; you can redistribute it and/or modify
|
| 4550 | |
@@ -18,9 +18,7 @@
|
| 4551 | |
# GNU General Public License for more details.
|
| 4552 | |
|
| 4553 | |
# You should have received a copy of the GNU General Public License
|
| 4554 | |
-# along with this program; if not, write to the Free Software
|
| 4555 | |
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
| 4556 | |
-# 02110-1301, USA.
|
| 4557 | |
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
| 4558 | |
|
| 4559 | |
# As a special exception to the GNU General Public License, if you
|
| 4560 | |
# distribute this file as part of a program that contains a
|
| 4561 | |
@@ -89,6 +87,9 @@
|
| 4562 | |
tar try tar, gnutar, gtar, then tar without non-portable flags
|
| 4563 | |
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
| 4564 | |
|
| 4565 | |
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
|
| 4566 | |
+\`g' are ignored when checking the name.
|
| 4567 | |
+
|
| 4568 | |
Send bug reports to <bug-automake@gnu.org>."
|
| 4569 | |
exit $?
|
| 4570 | |
;;
|
| 4571 | |
@@ -106,15 +107,22 @@
|
| 4572 | |
|
| 4573 | |
esac
|
| 4574 | |
|
| 4575 | |
+# normalize program name to check for.
|
| 4576 | |
+program=`echo "$1" | sed '
|
| 4577 | |
+ s/^gnu-//; t
|
| 4578 | |
+ s/^gnu//; t
|
| 4579 | |
+ s/^g//; t'`
|
| 4580 | |
+
|
| 4581 | |
# Now exit if we have it, but it failed. Also exit now if we
|
| 4582 | |
# don't have it and --version was passed (most likely to detect
|
| 4583 | |
-# the program).
|
| 4584 | |
+# the program). This is about non-GNU programs, so use $1 not
|
| 4585 | |
+# $program.
|
| 4586 | |
case $1 in
|
| 4587 | |
- lex|yacc)
|
| 4588 | |
+ lex*|yacc*)
|
| 4589 | |
# Not GNU programs, they don't have --version.
|
| 4590 | |
;;
|
| 4591 | |
|
| 4592 | |
- tar)
|
| 4593 | |
+ tar*)
|
| 4594 | |
if test -n "$run"; then
|
| 4595 | |
echo 1>&2 "ERROR: \`tar' requires --run"
|
| 4596 | |
exit 1
|
| 4597 | |
@@ -138,7 +146,7 @@
|
| 4598 | |
|
| 4599 | |
# If it does not exist, or fails to run (possibly an outdated version),
|
| 4600 | |
# try to emulate it.
|
| 4601 | |
-case $1 in
|
| 4602 | |
+case $program in
|
| 4603 | |
aclocal*)
|
| 4604 | |
echo 1>&2 "\
|
| 4605 | |
WARNING: \`$1' is $msg. You should only need it if
|
| 4606 | |
@@ -148,7 +156,7 @@
|
| 4607 | |
touch aclocal.m4
|
| 4608 | |
;;
|
| 4609 | |
|
| 4610 | |
- autoconf)
|
| 4611 | |
+ autoconf*)
|
| 4612 | |
echo 1>&2 "\
|
| 4613 | |
WARNING: \`$1' is $msg. You should only need it if
|
| 4614 | |
you modified \`${configure_ac}'. You might want to install the
|
| 4615 | |
@@ -157,7 +165,7 @@
|
| 4616 | |
touch configure
|
| 4617 | |
;;
|
| 4618 | |
|
| 4619 | |
- autoheader)
|
| 4620 | |
+ autoheader*)
|
| 4621 | |
echo 1>&2 "\
|
| 4622 | |
WARNING: \`$1' is $msg. You should only need it if
|
| 4623 | |
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
| 4624 | |
@@ -187,7 +195,7 @@
|
| 4625 | |
while read f; do touch "$f"; done
|
| 4626 | |
;;
|
| 4627 | |
|
| 4628 | |
- autom4te)
|
| 4629 | |
+ autom4te*)
|
| 4630 | |
echo 1>&2 "\
|
| 4631 | |
WARNING: \`$1' is needed, but is $msg.
|
| 4632 | |
You might have modified some files without having the
|
| 4633 | |
@@ -210,7 +218,7 @@
|
| 4634 | |
fi
|
| 4635 | |
;;
|
| 4636 | |
|
| 4637 | |
- bison|yacc)
|
| 4638 | |
+ bison*|yacc*)
|
| 4639 | |
echo 1>&2 "\
|
| 4640 | |
WARNING: \`$1' $msg. You should only need it if
|
| 4641 | |
you modified a \`.y' file. You may need the \`Bison' package
|
| 4642 | |
@@ -240,7 +248,7 @@
|
| 4643 | |
fi
|
| 4644 | |
;;
|
| 4645 | |
|
| 4646 | |
- lex|flex)
|
| 4647 | |
+ lex*|flex*)
|
| 4648 | |
echo 1>&2 "\
|
| 4649 | |
WARNING: \`$1' is $msg. You should only need it if
|
| 4650 | |
you modified a \`.l' file. You may need the \`Flex' package
|
| 4651 | |
@@ -263,7 +271,7 @@
|
| 4652 | |
fi
|
| 4653 | |
;;
|
| 4654 | |
|
| 4655 | |
- help2man)
|
| 4656 | |
+ help2man*)
|
| 4657 | |
echo 1>&2 "\
|
| 4658 | |
WARNING: \`$1' is $msg. You should only need it if
|
| 4659 | |
you modified a dependency of a manual page. You may need the
|
| 4660 | |
@@ -277,11 +285,11 @@
|
| 4661 | |
else
|
| 4662 | |
test -z "$file" || exec >$file
|
| 4663 | |
echo ".ab help2man is required to generate this page"
|
| 4664 | |
- exit 1
|
| 4665 | |
+ exit $?
|
| 4666 | |
fi
|
| 4667 | |
;;
|
| 4668 | |
|
| 4669 | |
- makeinfo)
|
| 4670 | |
+ makeinfo*)
|
| 4671 | |
echo 1>&2 "\
|
| 4672 | |
WARNING: \`$1' is $msg. You should only need it if
|
| 4673 | |
you modified a \`.texi' or \`.texinfo' file, or any other file
|
| 4674 | |
@@ -310,7 +318,7 @@
|
| 4675 | |
touch $file
|
| 4676 | |
;;
|
| 4677 | |
|
| 4678 | |
- tar)
|
| 4679 | |
+ tar*)
|
| 4680 | |
shift
|
| 4681 | |
|
| 4682 | |
# We have already tried tar in the generic part.
|
| 4683 | |
@@ -363,5 +371,6 @@
|
| 4684 | |
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
| 4685 | |
# time-stamp-start: "scriptversion="
|
| 4686 | |
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
| 4687 | |
-# time-stamp-end: "$"
|
| 4688 | |
+# time-stamp-time-zone: "UTC"
|
| 4689 | |
+# time-stamp-end: "; # UTC"
|
| 4690 | |
# End:
|