~ubuntu-branches/ubuntu/utopic/ibus-cangjie/utopic-updates

« back to all changes in this revision

Viewing changes to aclocal.m4

Committer: Package Import Robot
Author(s): Didier Roche
Date: 2015-05-26 09:19:14 UTC
mfrom: (6.1.4 sid)
Revision ID: package-import@ubuntu.com-20150526091914-bterkby7t7a62eux

Tags: 2.4-1~utopic1

https://launchpad.net/bugs/1452376

Backporting wily release sync to utopic to fix multiple UX issues
as per upstream request (LP: #1452376)

files added:
.pc/0001-install-engine-to-correct-dir.diff

.pc/0001-install-engine-to-correct-dir.diff/Makefile.am

compile

debian/patches

debian/patches/0001-install-engine-to-correct-dir.diff

debian/patches/series

files modified:
.pc/applied-patches

AUTHORS

Makefile.am

Makefile.in

aclocal.m4

config.guess

config.sub

configure

configure.ac

debian/changelog

debian/control

debian/copyright

debian/rules

debian/watch

install-sh

m4/intltool.m4

missing

po/Makefile.in.in

po/zh_TW.po

py-compile

src/engine.py

src/setup.py

test-driver

tests/run_tests.in

tests/test_prefs.py

Show diffs side-by-side

added added

removed removed

aclocal.m4

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

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

# This file is free software; the Free Software Foundation

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

319

AS_VAR_IF([$1], [""], [$5], [$4])dnl

320

])# PKG_CHECK_VAR

321

322

323

324

# This file is free software; the Free Software Foundation

325

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

331

# generated from the m4 files accompanying Automake X.Y.

332

# (This private macro should not be called outside this file.)

333

AC_DEFUN([AM_AUTOMAKE_VERSION],

334

[am__api_version='1.13'

334

[am__api_version='1.15'

335

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

336

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

337

m4_if([$1], [1.13.4], [],

337

m4_if([$1], [1.15], [],

338

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

339

])

340

350

# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

351

# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

352

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

353

[AM_AUTOMAKE_VERSION([1.13.4])dnl

353

[AM_AUTOMAKE_VERSION([1.15])dnl

354

m4_ifndef([AC_AUTOCONF_VERSION],

355

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

356

_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

357

358

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

359

360

361

362

# This file is free software; the Free Software Foundation

363

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

402

# configured tree to be moved without reconfiguration.

403

404

AC_DEFUN([AM_AUX_DIR_EXPAND],

405

[dnl Rely on autoconf to set up CDPATH properly.

406

AC_PREREQ([2.50])dnl

407

# expand $ac_aux_dir to an absolute path

408

am_aux_dir=`cd $ac_aux_dir && pwd`

405

[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl

406

# Expand $ac_aux_dir to an absolute path.

407

am_aux_dir=`cd "$ac_aux_dir" && pwd`

409

408

])

410

409

411

410

# AM_CONDITIONAL -*- Autoconf -*-

412

411

413

412

414

413

415

414

# This file is free software; the Free Software Foundation

416

415

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

441

440

Usually this means the macro was only invoked conditionally.]])

442

441

fi])])

443

442

444

443

445

444

446

445

# This file is free software; the Free Software Foundation

447

446

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

632

631

633

632

# Generate code to set up dependency tracking. -*- Autoconf -*-

634

633

635

634

636

635

637

636

# This file is free software; the Free Software Foundation

638

637

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

708

707

709

708

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

710

709

711

710

712

711

713

712

# This file is free software; the Free Software Foundation

714

713

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

717

716

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

718

717

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

719

718

719

dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.

720

m4_define([AC_PROG_CC],

721

m4_defn([AC_PROG_CC])

722

[_AM_PROG_CC_C_O

723

])

724

720

725

# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])

721

726

# AM_INIT_AUTOMAKE([OPTIONS])

722

727

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

792

797

# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>

793

798

# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>

794

799

AC_SUBST([mkdir_p], ['$(MKDIR_P)'])

795

# We need awk for the "check" target. The system "awk" is bad on

796

# some platforms.

800

# We need awk for the "check" target (and possibly the TAP driver). The

801

# system "awk" is bad on some platforms.

797

802

AC_REQUIRE([AC_PROG_AWK])dnl

798

803

AC_REQUIRE([AC_PROG_MAKE_SET])dnl

799

804

AC_REQUIRE([AM_SET_LEADING_DOT])dnl

825

830

AC_CONFIG_COMMANDS_PRE(dnl

826

831

[m4_provide_if([_AM_COMPILER_EXEEXT],

827

832

[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl

833

834

# POSIX will say in a future version that running "rm -f" with no argument

835

# is OK; and we want to be able to make that assumption in our Makefile

836

# recipes. So use an aggressive probe to check that the usage we want is

837

# actually supported "in the wild" to an acceptable degree.

838

# See automake bug#10828.

839

# To make any issue more visible, cause the running configure to be aborted

840

# by default if the 'rm' program in use doesn't match our expectations; the

841

# user can still override this though.

842

if rm -f && rm -fr && rm -rf; then : OK; else

843

cat >&2 <<'END'

844

Oops!

845

846

Your 'rm' program seems unable to run without file operands specified

847

on the command line, even when the '-f' option is present. This is contrary

848

to the behaviour of most rm programs out there, and not conforming with

849

the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>

850

851

Please tell bug-automake@gnu.org about your system, including the value

852

of your $PATH and any error possibly output before this message. This

853

can help us improve future automake versions.

854

855

END

856

if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then

857

echo 'Configuration will proceed anyway, since you have set the' >&2

858

echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2

859

echo >&2

860

else

861

cat >&2 <<'END'

862

Aborting the configuration process, to ensure you take notice of the issue.

863

864

You can download and install GNU coreutils to get an 'rm' implementation

865

that behaves properly: <http://www.gnu.org/software/coreutils/>.

866

867

If you want to complete the configuration process using your problematic

868

'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM

869

to "yes", and re-run configure.

870

871

END

872

AC_MSG_ERROR([Your 'rm' program is bad, sorry.])

873

874

875

dnl The trailing newline in this macro's definition is deliberate, for

876

dnl backward compatibility and to allow trailing 'dnl'-style comments

877

dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.

828

878

])

829

879

830

880

dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not

833

883

m4_define([_AC_COMPILER_EXEEXT],

834

884

m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])

835

885

836

837

886

# When config.status generates a header, we must update the stamp-h file.

838

887

# This file resides in the same directory as the config header

839

888

# that is generated. The stamp files are numbered to have different names.

855

904

done

856

905

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

857

906

858

907

859

908

860

909

# This file is free software; the Free Software Foundation

861

910

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

866

915

# Define $install_sh.

867

916

AC_DEFUN([AM_PROG_INSTALL_SH],

868

917

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

869

if test x"${install_sh}" != xset; then

918

if test x"${install_sh+set}" != xset; then

870

919

case $am_aux_dir in

871

920

*\ * | *\ *)

872

921

install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

876

925

877

926

AC_SUBST([install_sh])])

878

927

879

928

880

929

881

930

# This file is free software; the Free Software Foundation

882

931

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

897

946

898

947

# Check to see how 'make' treats includes. -*- Autoconf -*-

899

948

900

949

901

950

902

951

# This file is free software; the Free Software Foundation

903

952

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

947

996

948

997

# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

949

998

950

999

951

1000

952

1001

# This file is free software; the Free Software Foundation

953

1002

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

984

1033

985

1034

])

986

1035

987

1036

988

1037

989

1038

# This file is free software; the Free Software Foundation

990

1039

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

1018

1067

1019

1068

# Helper functions for option handling. -*- Autoconf -*-

1020

1069

1021

1070

1022

1071

1023

1072

# This file is free software; the Free Software Foundation

1024

1073

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

1047

1096

AC_DEFUN([_AM_IF_OPTION],

1048

1097

[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

1049

1098

1050

1099

1100

1101

# This file is free software; the Free Software Foundation

1102

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

1103

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

1104

1105

# _AM_PROG_CC_C_O

1106

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

1107

# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC

1108

# to automatically call this.

1109

AC_DEFUN([_AM_PROG_CC_C_O],

1110

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

1111

AC_REQUIRE_AUX_FILE([compile])dnl

1112

AC_LANG_PUSH([C])dnl

1113

AC_CACHE_CHECK(

1114

[whether $CC understands -c and -o together],

1115

[am_cv_prog_cc_c_o],

1116

[AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])

1117

# Make sure it works both with $CC and with simple cc.

1118

# Following AC_PROG_CC_C_O, we do the test twice because some

1119

# compilers refuse to overwrite an existing .o file with -o,

1120

# though they will create one.

1121

am_cv_prog_cc_c_o=yes

1122

for am_i in 1 2; do

1123

if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \

1124

&& test -f conftest2.$ac_objext; then

1125

: OK

1126

else

1127

am_cv_prog_cc_c_o=no

1128

break

1129

1130

done

1131

rm -f core conftest*

1132

unset am_i])

1133

if test "$am_cv_prog_cc_c_o" != yes; then

1134

# Losing compiler, so override with the script.

1135

# FIXME: It is wrong to rewrite CC.

1136

# But if we don't then we get into trouble of one sort or another.

1137

# A longer-term fix would be to have automake use am__CC in this case,

1138

# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"

1139

CC="$am_aux_dir/compile $CC"

1140

1141

AC_LANG_POP([C])])

1142

1143

# For backward compatibility.

1144

AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])

1145

1146

1051

1147

1052

1148

# This file is free software; the Free Software Foundation

1053

1149

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

1282

1378

sys.exit(sys.hexversion < minverhex)"

1283

1379

AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])

1284

1380

1285

1381

1286

1382

1287

1383

# This file is free software; the Free Software Foundation

1288

1384

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

1301

1397

1302

1398

# Check to make sure that the build environment is sane. -*- Autoconf -*-

1303

1399

1304

1400

1305

1401

1306

1402

# This file is free software; the Free Software Foundation

1307

1403

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

1382

1478

rm -f conftest.file

1383

1479

])

1384

1480

1385

1481

1386

1482

1387

1483

# This file is free software; the Free Software Foundation

1388

1484

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

1442

1538

_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl

1443

1539

])

1444

1540

1445

1541

1446

1542

1447

1543

# This file is free software; the Free Software Foundation

1448

1544

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

1470

1566

INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

1471

1567

AC_SUBST([INSTALL_STRIP_PROGRAM])])

1472

1568

1473

1569

1474

1570

1475

1571

# This file is free software; the Free Software Foundation

1476

1572

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

1489

1585

1490

1586

# Check how to create a tarball. -*- Autoconf -*-

1491

1587

1492

1588

1493

1589

1494

1590

# This file is free software; the Free Software Foundation

1495

1591

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

Older »