~ubuntu-branches/ubuntu/karmic/gnome-mount/karmic

Viewing changes to aclocal.m4

Committer: Bazaar Package Importer
Author(s): Martin Pitt
Date: 2008-03-05 15:30:46 UTC
mfrom: (1.2.3 upstream)
Revision ID: james.westby@ubuntu.com-20080305153046-1m3pthhak9rx6yl7

Tags: 0.8~svn20080225-0ubuntu1

* Update to SVN snapshot:
  - Builds nautilus extension for new nautilus 2.0 ABI now, unbreaking the
    volume/drive properties tabs. (LP: #186196)
  - Applied debian/patches/02_msgbox_unref.patch upstream, removed patch.
  - No other changes.
* debian/patches/ubuntu-default-mount-options.patch: Use 'flush' option for
  vfat. It does not actually work in the current kernel, but at least it's
  there once it will actually do something useful. (LP: #149277)

Show diffs side-by-side

added added

removed removed

aclocal.m4

# generated automatically by aclocal 1.10 -*- Autoconf -*-

# generated automatically by aclocal 1.10.1 -*- Autoconf -*-

# 2005, 2006 Free Software Foundation, Inc.

# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

# with or without modifications, as long as this notice is preserved.

# even the implied warranty of MERCHANTABILITY or FITNESS FOR A

# PARTICULAR PURPOSE.

m4_if(m4_PACKAGE_VERSION, [2.61],,

[m4_fatal([this file was generated for autoconf 2.61.

You have another version of autoconf. If you want to use that,

you should regenerate the build system entirely.], [63])])

m4_ifndef([AC_AUTOCONF_VERSION],

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

m4_if(AC_AUTOCONF_VERSION, [2.61],,

[m4_warning([this file was generated for autoconf 2.61.

You have another version of autoconf. It may work, but is not guaranteed to.

If you have problems, you may need to regenerate the build system entirely.

To do so, use the procedure documented by the package, typically `autoreconf'.])])

dnl AM_GCONF_SOURCE_2

dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas

159

162

#-----------------

160

163

glib_DEFUN([GLIB_WITH_NLS],

161

164

dnl NLS is obligatory

162

[AC_REQUIRE([AC_CANONICAL_HOST])dnl

163

USE_NLS=yes

165

[USE_NLS=yes

164

166

AC_SUBST(USE_NLS)

165

167

166

168

gt_cv_have_gettext=no

556

558

AC_SUBST(INTLTOOL_SERVICE_RULE)

557

559

AC_SUBST(INTLTOOL_POLICY_RULE)

558

560

561

# Check the gettext tools to make sure they are GNU

562

AC_PATH_PROG(XGETTEXT, xgettext)

563

AC_PATH_PROG(MSGMERGE, msgmerge)

564

AC_PATH_PROG(MSGFMT, msgfmt)

565

if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then

566

AC_MSG_ERROR([GNU gettext tools not found; required for intltool])

567

568

xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"

569

mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"

570

mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"

571

if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then

572

AC_MSG_ERROR([GNU gettext tools not found; required for intltool])

573

574

559

575

# Use the tools built into the package, not the ones that are installed.

560

576

AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')

561

577

AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')

7324

7340

# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])

7325

7341

# ---------------------------------------------

7326

7342

m4_define([_PKG_CONFIG],

7327

[if test -n "$PKG_CONFIG"; then

7328

if test -n "$$1"; then

7329

pkg_cv_[]$1="$$1"

7330

else

7331

PKG_CHECK_EXISTS([$3],

7332

[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],

7333

[pkg_failed=yes])

7334

7335

else

7336

pkg_failed=untried

7343

[if test -n "$$1"; then

7344

pkg_cv_[]$1="$$1"

7345

elif test -n "$PKG_CONFIG"; then

7346

PKG_CHECK_EXISTS([$3],

7347

[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],

7348

[pkg_failed=yes])

7349

else

7350

pkg_failed=untried

7337

7351

fi[]dnl

7338

7352

])# _PKG_CONFIG

7339

7353

7377

7391

if test $pkg_failed = yes; then

7378

7392

_PKG_SHORT_ERRORS_SUPPORTED

7379

7393

if test $_pkg_short_errors_supported = yes; then

7380

$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`

7394

$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`

7381

7395

else

7382

$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`

7396

$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`

7383

7397

7384

7398

# Put the nasty error message in config.log where it belongs

7385

7399

echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

7414

7428

fi[]dnl

7415

7429

])# PKG_CHECK_MODULES

7416

7430

7417

7431

7418

7432

7419

7433

# This file is free software; the Free Software Foundation

7420

7434

# gives unlimited permission to copy and/or distribute it,

7429

7443

[am__api_version='1.10'

7430

7444

dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

7431

7445

dnl require some minimum version. Point them to the right macro.

7432

m4_if([$1], [1.10], [],

7446

m4_if([$1], [1.10.1], [],

7433

7447

[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

7434

7448

])

7435

7449

7445

7459

# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

7446

7460

# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

7447

7461

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

7448

[AM_AUTOMAKE_VERSION([1.10])dnl

7449

_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])

7462

[AM_AUTOMAKE_VERSION([1.10.1])dnl

7463

m4_ifndef([AC_AUTOCONF_VERSION],

7464

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

7465

_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

7450

7466

7451

7467

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

7452

7468

7718

7734

# each Makefile.in and add a new line on top of each file to say so.

7719

7735

# Grep'ing the whole file is not good either: AIX grep has a line

7720

7736

# limit of 2048, but all sed's we know have understand at least 4000.

7721

if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then

7737

if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

7722

7738

dirpart=`AS_DIRNAME("$mf")`

7723

7739

else

7724

7740

continue

7778

7794

# Do all the work for Automake. -*- Autoconf -*-

7779

7795

7780

7796

7781

# 2005, 2006 Free Software Foundation, Inc.

7797

# 2005, 2006, 2008 Free Software Foundation, Inc.

7782

7798

7783

7799

# This file is free software; the Free Software Foundation

7784

7800

# gives unlimited permission to copy and/or distribute it,

7785

7801

# with or without modifications, as long as this notice is preserved.

7786

7802

7787

# serial 12

7803

# serial 13

7788

7804

7789

7805

# This macro actually does too much. Some checks are only needed if

7790

7806

# your package does certain things. But this isn't really a big deal.

7889

7905

# our stamp files there.

7890

7906

AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],

7891

7907

[# Compute $1's index in $config_headers.

7908

_am_arg=$1

7892

7909

_am_stamp_count=1

7893

7910

for _am_header in $config_headers :; do

7894

7911

case $_am_header in

7895

$1 | $1:* )

7912

$_am_arg | $_am_arg:* )

7896

7913

break ;;

7897

7914

* )

7898

7915

_am_stamp_count=`expr $_am_stamp_count + 1` ;;

7899

7916

esac

7900

7917

done

7901

echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

7918

echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

7902

7919

7903

7920

7904

7921

8170

8187

8171

8188

# _AM_SUBST_NOTMAKE(VARIABLE)

8172

8189

# ---------------------------

8173

# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.

8190

# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

8174

8191

# This macro is traced by Automake.

8175

8192

AC_DEFUN([_AM_SUBST_NOTMAKE])

8176

8193

Older »