← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nautilus/trusty-proposed

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2014-01-02 16:50:06 UTC
  • mfrom: (1.17.43)
  • Revision ID: package-import@ubuntu.com-20140102165006-1ghk9ropzitdc8pp
Tags: 1:3.10.1-0ubuntu1
https://launchpad.net/bugs/1272602
* New upstream release
* debian/control.in: bump depend on gtk+ 3.9.11
* debian/patches:
  - Dropped git patches, that are included in new version
  - 06_never_exec_nonexec_launchers.patch, refreshed
  - disconnect-extra-location-widgets.patch, dropped included in new version
  - 16_unity_new_documents.patch, refreshed
  - ubuntu_show_titlebar.patch, disable CSD titlebar on non-GNOME sessions
  - ubuntu_titlebar_css.patch, theme fixes (LP: #1272602)

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
1
 
# generated automatically by aclocal 1.13.2 -*- Autoconf -*-
 
1
# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
2
2
 
3
3
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
4
4
 
35
35
[am__api_version='1.13'
36
36
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
37
37
dnl require some minimum version.  Point them to the right macro.
38
 
m4_if([$1], [1.13.2], [],
 
38
m4_if([$1], [1.13.4], [],
39
39
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
40
40
])
41
41
 
51
51
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
52
52
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
53
53
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54
 
[AM_AUTOMAKE_VERSION([1.13.2])dnl
 
54
[AM_AUTOMAKE_VERSION([1.13.4])dnl
55
55
m4_ifndef([AC_AUTOCONF_VERSION],
56
56
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
57
57
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
1323
1323
m4_popdef([pkg_description])
1324
1324
]) dnl PKG_NOARCH_INSTALLDIR
1325
1325
 
 
1326
 
 
1327
# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
 
1328
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 
1329
# -------------------------------------------
 
1330
# Retrieves the value of the pkg-config variable for the given module.
 
1331
AC_DEFUN([PKG_CHECK_VAR],
 
1332
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 
1333
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
 
1334
 
 
1335
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
 
1336
AS_VAR_COPY([$1], [pkg_cv_][$1])
 
1337
 
 
1338
AS_VAR_IF([$1], [""], [$5], [$4])dnl
 
1339
])# PKG_CHECK_VAR
 
1340
 
1326
1341
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
1327
1342
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
1328
1343
#