← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ibus/utopic

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Package Import Robot
  • Author(s): Ikuya Awashiro
  • Date: 2014-02-03 22:34:56 UTC
  • mfrom: (39.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20140203223456-amzf73jp5qt59rrr
Tags: 1.5.5-1ubuntu1
https://launchpad.net/bugs/1276143
https://launchpad.net/bugs/1255542
* Merge with Debian (LP: #1276143); remaining changes: 
  - debian/rules:
    + Build with dh_translations. Add dh-translations build dependency.
  - Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input
    Methods"
  - debian/patches/ibus-no-notification.patch: Don't show the notification
    if not actually upgrading from a previous version. (LP: #1255542).
* debian/patches/03_dont_run_dconf_update.patch: added
  -  Don't run "dconf update" if $(DESTDIR) is set
    + https://github.com/ibus/ibus/commit/e6ec45d64a32d16245770f8b80e795a63e6ad553

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
552
552
dnl
553
553
glib_DEFUN([GLIB_GNU_GETTEXT],
554
554
  [AC_REQUIRE([AC_PROG_CC])dnl
555
 
   AC_REQUIRE([AC_HEADER_STDC])dnl
556
555
   
557
556
   GLIB_LC_MESSAGES
558
557
   GLIB_WITH_NLS
989
988
m4_popdef([pkg_description])
990
989
]) dnl PKG_NOARCH_INSTALLDIR
991
990
 
 
991
 
 
992
# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
 
993
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 
994
# -------------------------------------------
 
995
# Retrieves the value of the pkg-config variable for the given module.
 
996
AC_DEFUN([PKG_CHECK_VAR],
 
997
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 
998
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
 
999
 
 
1000
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
 
1001
AS_VAR_COPY([$1], [pkg_cv_][$1])
 
1002
 
 
1003
AS_VAR_IF([$1], [""], [$5], [$4])dnl
 
1004
])# PKG_CHECK_VAR
 
1005
 
992
1006
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
993
1007
#
994
1008
# This file is free software; the Free Software Foundation