← Back to branch summary

~ken-vandine/ubuntu/precise/folks/precise

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-11-26 14:12:44 UTC
  • mfrom: (1.2.4 upstream) (4.1.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20101126141244-0r97g01y2npcalc8
Tags: 0.3.2-1ubuntu1
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Build-depend on dh-autoreconf
  - Bump build-depends on valac-0.12, libvala-0.12-dev
  - Add Vcs-Bzr link
* debian/rules:
  - Build with autoreconf
* debian/patches/00git_no_gettext.patch:
  - Don't use IT_PROG_INTLTOOL and AM_GNU_GETTEXT
* debian/patches/01_tests_ldflags.patch:
  - Link telepathy tests to GIO

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
156
156
Consider adjusting the PKG_CONFIG_PATH environment variable if you
157
157
installed software in a non-standard prefix.
158
158
 
159
 
_PKG_TEXT])dnl
 
159
_PKG_TEXT])[]dnl
160
160
        ])
161
161
elif test $pkg_failed = untried; then
162
162
        AC_MSG_RESULT([no])
167
167
 
168
168
_PKG_TEXT
169
169
 
170
 
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
 
170
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
171
171
        ])
172
172
else
173
173
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
1257
1257
])
1258
1258
 
1259
1259
m4_include([m4/as-compiler-flag.m4])
 
1260
m4_include([m4/gettext.m4])
 
1261
m4_include([m4/iconv.m4])
 
1262
m4_include([m4/intlmacosx.m4])
 
1263
m4_include([m4/intltool.m4])
1260
1264
m4_include([m4/introspection.m4])
 
1265
m4_include([m4/lib-ld.m4])
 
1266
m4_include([m4/lib-link.m4])
 
1267
m4_include([m4/lib-prefix.m4])
1261
1268
m4_include([m4/libtool.m4])
1262
1269
m4_include([m4/ltoptions.m4])
1263
1270
m4_include([m4/ltsugar.m4])
1264
1271
m4_include([m4/ltversion.m4])
1265
1272
m4_include([m4/lt~obsolete.m4])
 
1273
m4_include([m4/nls.m4])
 
1274
m4_include([m4/po.m4])
 
1275
m4_include([m4/progtest.m4])
1266
1276
m4_include([m4/vala.m4])