[emacs-debian commit] Merge from jerome@debian.org (through patch
17) @ emacs-debian--main--21.4
Rob Browning
rlb at defaultvalue.org
Sun Sep 18 03:25:18 UTC 2005
===============================================
WARNING: MESSAGE TRUNCATED TO 1000 LINES
===============================================
Revision: emacs-debian--main--21.4--patch-4
Archive: rlb at defaultvalue.org--debian-emacs-1
Creator: Rob Browning <rlb at defaultvalue.org>
Date: Sat Sep 17 20:25:17 PDT 2005
Standard-date: 2005-09-18 03:25:17 GMT
New-files: patches/.arch-ids/arch-ppc64.dpatch.id
patches/.arch-ids/multibyte-char-key-modifiers.dpatch.id
patches/.arch-ids/whitespace-readonly-infloop.dpatch.id
patches/.arch-ids/xorg-altgr-fix.dpatch.id
patches/arch-ppc64.dpatch
patches/multibyte-char-key-modifiers.dpatch
patches/whitespace-readonly-infloop.dpatch
patches/xorg-altgr-fix.dpatch
Modified-files: bin/.arch-ids/=id bin/info/.arch-ids/=id
bin/info/.arch-ids/install-info.id
bin/info/install-info build-binary-pkg changelog control
control.in emacs.desktop mangle-info menu.in
patches/00list patches/autofiles.dpatch
patches/emacsclient-alternate-editor.dpatch
patches/python-completion-ignored-extensions.dpatch
Modified-directories: {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/rlb at defaultvalue.org--debian-emacs-1
{arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/rlb at defaultvalue.org--debian-emacs-1/patch-log
New-patches: jerome at debian.org--2005/emacs-debian--main--21.4--patch-9
jerome at debian.org--2005/emacs-debian--main--21.4--patch-10
jerome at debian.org--2005/emacs-debian--main--21.4--patch-11
jerome at debian.org--2005/emacs-debian--main--21.4--patch-12
jerome at debian.org--2005/emacs-debian--main--21.4--patch-13
jerome at debian.org--2005/emacs-debian--main--21.4--patch-14
jerome at debian.org--2005/emacs-debian--main--21.4--patch-15
jerome at debian.org--2005/emacs-debian--main--21.4--patch-16
jerome at debian.org--2005/emacs-debian--main--21.4--patch-17
rlb at defaultvalue.org--debian-emacs-1/emacs-debian--main--21.4--patch-4
Summary: Merge from jerome at debian.org (through patch 17)
Keywords:
Patches applied:
* jerome at debian.org--2005/emacs-debian--main--21.4--patch-9
Merge 21.4a from Rob's archive
* jerome at debian.org--2005/emacs-debian--main--21.4--patch-10
Add support for ppc64 architecture
* jerome at debian.org--2005/emacs-debian--main--21.4--patch-11
Add patch applying modifiers to multibyte-char keys (#309963)
* jerome at debian.org--2005/emacs-debian--main--21.4--patch-12
Add libtiff4-dev as alternative build-dependency to libtiff-dev
* jerome at debian.org--2005/emacs-debian--main--21.4--patch-13
Bump Standards-Version to 3.6.2
* jerome at debian.org--2005/emacs-debian--main--21.4--patch-14
Use the "kitchen sink" bitmap icon when iconifying the Emacs window (#309930)
* jerome at debian.org--2005/emacs-debian--main--21.4--patch-15
Work around bug in Xorg which makes AltGr incorrectly recognized
* jerome at debian.org--2005/emacs-debian--main--21.4--patch-16
Apply patch preventing an infinite loop in whitespace.el if kill-read-only is set to t (#273123)
* jerome at debian.org--2005/emacs-debian--main--21.4--patch-17
In the desktop file, pass the '-i' option to Emacs as well
* looking for rlb at defaultvalue.org--debian-emacs-1/emacs-debian--main--21.4--patch-3 to compare with
* comparing to rlb at defaultvalue.org--debian-emacs-1/emacs-debian--main--21.4--patch-3
A patches/.arch-ids/arch-ppc64.dpatch.id
A patches/.arch-ids/multibyte-char-key-modifiers.dpatch.id
A patches/.arch-ids/whitespace-readonly-infloop.dpatch.id
A patches/.arch-ids/xorg-altgr-fix.dpatch.id
A patches/arch-ppc64.dpatch
A patches/multibyte-char-key-modifiers.dpatch
A patches/whitespace-readonly-infloop.dpatch
A patches/xorg-altgr-fix.dpatch
A {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/jerome at debian.org--2005/patch-log/patch-10
A {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/jerome at debian.org--2005/patch-log/patch-11
A {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/jerome at debian.org--2005/patch-log/patch-12
A {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/jerome at debian.org--2005/patch-log/patch-13
A {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/jerome at debian.org--2005/patch-log/patch-14
A {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/jerome at debian.org--2005/patch-log/patch-15
A {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/jerome at debian.org--2005/patch-log/patch-16
A {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/jerome at debian.org--2005/patch-log/patch-17
A {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/jerome at debian.org--2005/patch-log/patch-9
A {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/rlb at defaultvalue.org--debian-emacs-1/patch-log/patch-4
-- bin/.arch-ids/=id
-- bin/info/.arch-ids/=id
-- bin/info/.arch-ids/install-info.id
M emacs.desktop
-- patches/python-completion-ignored-extensions.dpatch
-- patches/emacsclient-alternate-editor.dpatch
M patches/00list
-- build-binary-pkg
M changelog
M control
M control.in
-- mangle-info
M menu.in
-- bin/info/install-info
-- patches/autofiles.dpatch
M patches/autofiles.dpatch
-/ {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/rlb at defaultvalue.org--debian-emacs-1
-/ {arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/rlb at defaultvalue.org--debian-emacs-1/patch-log
* file metadata changed
./bin/.arch-ids/=id
--permissions 640
=> --permissions 775
./bin/info/.arch-ids/=id
--permissions 640
=> --permissions 775
./bin/info/.arch-ids/install-info.id
--permissions 640
=> --permissions 775
./bin/info/install-info
--permissions 640
=> --permissions 775
./build-binary-pkg
--permissions 640
=> --permissions 751
./mangle-info
--permissions 640
=> --permissions 755
./patches/autofiles.dpatch
--permissions 710
=> --permissions 711
./patches/emacsclient-alternate-editor.dpatch
--permissions 640
=> --permissions 751
./patches/python-completion-ignored-extensions.dpatch
--permissions 640
=> --permissions 751
* dir metadata changed
./{arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/rlb at defaultvalue.org--debian-emacs-1
--permissions 750
=> --permissions 755
./{arch}/emacs-debian/emacs-debian--main/emacs-debian--main--21.4/rlb at defaultvalue.org--debian-emacs-1/patch-log
--permissions 750
=> --permissions 755
* modified files
--- orig/changelog
+++ mod/changelog
@@ -1,3 +1,46 @@
+emacs21 (21.4a-2) unstable; urgency=low
+
+ * Apply patch applying modifiers to multibyte-char keys. Thanks to
+ Martin Stjernholm <mast at lysator.liu.se> (closes: #309963) [Jérôme Marant]
+ - debian/patches/multibyte-char-key-modifiers.dpatch: new file.
+ - debian/00list: updated.
+
+ * Apply patch supporting the ppc64 architecture. This is a slightly
+ modified patch derived from the Emacs CVS mainline.
+ (closes: #300368) [Jérôme Marant]
+ - debian/patches/arch-ppc64.patch: new file.
+ - debian/00list: updated.
+
+ * Add real dependency as an alternative to the libtiff-dev build
+ dependency in order for the build to be deterministic.
+ (closes: #311074) [Jérôme Marant]
+ - debian/control.in: add libtiff4-dev as alternative libtiff-dev
+ build dependency.
+ - debian/control: regenerated.
+
+ * Bump Standards-Version to 3.6.2. [Jérôme Marant]
+ - debian/control.in
+ - debian/control: regenerated.
+
+ * Use the "kitchen sink" bitmap icon when iconifying the Emacs window.
+ (closes: #309930) [Jérôme Marant]
+ - debian/menu.in: pass the `-i' option to the command launching Emacs
+ under X11.
+ - debian/emacs.desktop: likewise.
+
+ * Work around bug in Xorg which makes AltGr incorrectly recognized.
+ This patch has been backported from Emacs CVS trunk. [Jérôme Marant]
+ - debian/patches/xorg-altgr-fix.dpatch: new file.
+ - debian/00list: updated.
+
+ * Apply patch preventing an infinite loop in whitespace.el if kill-read-only
+ is set to t. Thanks to Romain Francoise <rfrancoise at debian.org>
+ (closes: #273123) [Jérôme Marant]
+ - debian/patches/whitespace-readonly-infloop.dpatch: new file.
+ - debian/00list: updated.
+
+ --
+
emacs21 (21.4a-1) unstable; urgency=medium
* New upstream release. (closes: #294313) [Jérôme Marant]
--- orig/control
+++ mod/control
@@ -2,8 +2,8 @@
Section: editors
Priority: optional
Maintainer: Rob Browning <rlb at defaultvalue.org>
-Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff-dev, xaw3dg-dev, libpng3-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), dpatch (>= 2.0.9)
-Standards-Version: 3.6.1
+Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng3-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), dpatch (>= 2.0.9)
+Standards-Version: 3.6.2
Package: emacs21
Section: editors
--- orig/control.in
+++ mod/control.in
@@ -2,8 +2,8 @@
Section: editors
Priority: optional
Maintainer: Rob Browning <rlb at defaultvalue.org>
-Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff-dev, xaw3dg-dev, libpng3-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), dpatch (>= 2.0.9)
-Standards-Version: 3.6.1
+Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng3-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), dpatch (>= 2.0.9)
+Standards-Version: 3.6.2
Package: emacs at MAJOR_VERSION@
Section: editors
--- orig/emacs.desktop
+++ mod/emacs.desktop
@@ -4,7 +4,7 @@
Name=Emacs @MAJOR_VERSION@ (X11)
GenericName=Emacs
Comment=GNU Emacs @MAJOR_VERSION@ Text Editor
-Exec=/usr/bin/emacs at MAJOR_VERSION@
+Exec=/usr/bin/emacs at MAJOR_VERSION@ -i
TryExec=emacs at MAJOR_VERSION@
Terminal=false
Type=Application
--- orig/menu.in
+++ mod/menu.in
@@ -2,7 +2,7 @@
needs="X11"\
section="Apps/Editors"\
title="Emacs @MAJOR_VERSION@ (X11)"\
- command="/usr/bin/emacs at MAJOR_VERSION@"\
+ command="/usr/bin/emacs at MAJOR_VERSION@ -i"\
icon="/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm"\
hints="Text"
--- orig/patches/00list
+++ mod/patches/00list
@@ -21,5 +21,9 @@
remote-files-permissions
pcl-cvs-format
arch-amd64
+arch-ppc64
+multibyte-char-key-modifiers
+xorg-altgr-fix
+whitespace-readonly-infloop
fix-x-vs-no-x-diffs
autofiles
--- orig/patches/autofiles.dpatch
+++ mod/patches/autofiles.dpatch
@@ -24,11 +24,12 @@
exit 0
@DPATCH@
-diff -urNad emacs21/aclocal.m4 /tmp/dpep.WGuyVy/emacs21/aclocal.m4
---- emacs21/aclocal.m4 2001-10-19 11:44:44.000000000 -0500
-+++ /tmp/dpep.WGuyVy/emacs21/aclocal.m4 2005-03-15 11:04:51.000000000 -0600
-@@ -1,532 +0,0 @@
--
+diff -urNad emacs21-21.4a/aclocal.m4 /tmp/dpep.PpW6qa/emacs21-21.4a/aclocal.m4
+--- emacs21-21.4a/aclocal.m4 2005-05-01 14:24:45.000000000 +0200
++++ /tmp/dpep.PpW6qa/emacs21-21.4a/aclocal.m4 2005-05-01 20:06:34.343049016 +0200
+@@ -1,532 +1,831 @@
++dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+
-% Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-%
-% This file is part of GNU Emacs.
@@ -250,12 +251,20 @@
-{
- time_t t, delta;
- int i, j;
--
++dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
+
- /* This test makes some buggy mktime implementations loop.
- Give up after 60 seconds; a mktime slower than that
- isn't worth using anyway. */
- alarm (60);
--
++dnl This program is distributed in the hope that it will be useful,
++dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++dnl PARTICULAR PURPOSE.
+
- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
- continue;
- time_t_max--;
@@ -264,12 +273,18 @@
- {
- if (tz_strings[i])
- putenv (tz_strings[i]);
--
++# lib-prefix.m4 serial 4 (gettext-0.14.2)
++dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
+
- for (t = 0; t <= time_t_max - delta; t += delta)
- mktime_test (t);
- mktime_test ((time_t) 60 * 60);
- mktime_test ((time_t) 60 * 60 * 24);
--
++dnl From Bruno Haible.
+
- for (j = 1; 0 < j; j *= 2)
- bigtime_test (j);
- bigtime_test (j - 1);
@@ -285,7 +300,13 @@
-fi
-AC_SUBST(LIBOBJS)dnl
-])# AC_FUNC_MKTIME
--
++dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
++dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
++dnl require excessive bracketing.
++ifdef([AC_HELP_STRING],
++[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
++[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
-# AC_C_VOLATILE
-# -------------
-# Note that, unlike const, #defining volatile to be the empty string can
@@ -307,8 +328,108 @@
- Warning: valid code using `volatile' can become incorrect
- without. Disable with care.])
-fi
--])
--
++dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
++dnl to access previously installed libraries. The basic assumption is that
++dnl a user will want packages to use other packages he previously installed
++dnl with the same --prefix option.
++dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
++dnl libraries, but is otherwise very convenient.
++AC_DEFUN([AC_LIB_PREFIX],
++[
++ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
++ AC_REQUIRE([AC_PROG_CC])
++ AC_REQUIRE([AC_CANONICAL_HOST])
++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
++ dnl By default, look in $includedir and $libdir.
++ use_additional=yes
++ AC_LIB_WITH_FINAL_PREFIX([
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++ ])
++ AC_LIB_ARG_WITH([lib-prefix],
++[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
++ --without-lib-prefix don't search for libraries in includedir and libdir],
++[
++ if test "X$withval" = "Xno"; then
++ use_additional=no
++ else
++ if test "X$withval" = "X"; then
++ AC_LIB_WITH_FINAL_PREFIX([
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++ ])
++ else
++ additional_includedir="$withval/include"
++ additional_libdir="$withval/lib"
++ fi
++ fi
++])
++ if test $use_additional = yes; then
++ dnl Potentially add $additional_includedir to $CPPFLAGS.
++ dnl But don't add it
++ dnl 1. if it's the standard /usr/include,
++ dnl 2. if it's already present in $CPPFLAGS,
++ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
++ dnl 4. if it doesn't exist as a directory.
++ if test "X$additional_includedir" != "X/usr/include"; then
++ haveit=
++ for x in $CPPFLAGS; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-I$additional_includedir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test "X$additional_includedir" = "X/usr/local/include"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ if test -d "$additional_includedir"; then
++ dnl Really add $additional_includedir to $CPPFLAGS.
++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
++ fi
++ fi
++ fi
++ fi
++ dnl Potentially add $additional_libdir to $LDFLAGS.
++ dnl But don't add it
++ dnl 1. if it's the standard /usr/lib,
++ dnl 2. if it's already present in $LDFLAGS,
++ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
++ dnl 4. if it doesn't exist as a directory.
++ if test "X$additional_libdir" != "X/usr/lib"; then
++ haveit=
++ for x in $LDFLAGS; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ dnl Really add $additional_libdir to $LDFLAGS.
++ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
++ fi
++ fi
++ fi
++ fi
++ fi
+ ])
+
-# AC_C_PROTOTYPES
-# ---------------
-# Check if the C compiler supports prototypes, included if it needs
@@ -335,14 +456,49 @@
-dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
-
-dnl Written by Paul Eggert <eggert at twinsun.com>.
--
++dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
++dnl acl_final_exec_prefix, containing the values to which $prefix and
++dnl $exec_prefix will expand at the end of the configure script.
++AC_DEFUN([AC_LIB_PREPARE_PREFIX],
++[
++ dnl Unfortunately, prefix and exec_prefix get only finally determined
++ dnl at the end of configure.
++ if test "X$prefix" = "XNONE"; then
++ acl_final_prefix="$ac_default_prefix"
++ else
++ acl_final_prefix="$prefix"
++ fi
++ if test "X$exec_prefix" = "XNONE"; then
++ acl_final_exec_prefix='${prefix}'
++ else
++ acl_final_exec_prefix="$exec_prefix"
++ fi
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
++ prefix="$acl_save_prefix"
++])
+
-dnl Internal subroutine of AC_SYS_LARGEFILE.
-dnl AC_SYS_LARGEFILE_TEST_INCLUDES
-AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
- [[#include <sys/types.h>
- int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
- ]])
--
++dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
++dnl variables prefix and exec_prefix bound to the values they will have
++dnl at the end of the configure script.
++AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
++[
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ $1
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++])
+
-dnl Internal subroutine of AC_SYS_LARGEFILE.
-dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
-AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
@@ -359,13 +515,19 @@
- if test "[$]$3" != no; then
- AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
- fi])
--
++# lib-link.m4 serial 6 (gettext-0.14.3)
++dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
+
-AC_DEFUN(AC_SYS_LARGEFILE,
- [AC_REQUIRE([AC_PROG_CC])
- AC_ARG_ENABLE(largefile,
- [ --disable-largefile omit support for large files])
- if test "$enable_largefile" != no; then
--
++dnl From Bruno Haible.
+
- AC_CACHE_CHECK([for special C compiler options needed for large files],
- ac_cv_sys_largefile_CC,
- [ac_cv_sys_largefile_CC=no
@@ -382,7 +544,8 @@
- if test "$ac_cv_sys_largefile_CC" != no; then
- CC="$CC$ac_cv_sys_largefile_CC"
- fi
--
++AC_PREREQ(2.50)
+
- AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
- ac_cv_sys_file_offset_bits,
- [Number of bits in a file offset, on hosts where this is settable.],
@@ -392,8 +555,36 @@
- [Define for large files, on AIX-style hosts.]
- AC_SYS_LARGEFILE_TEST_INCLUDES)
- fi
-- ])
--
++dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
++dnl the libraries corresponding to explicit and implicit dependencies.
++dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
++dnl augments the CPPFLAGS variable.
++AC_DEFUN([AC_LIB_LINKFLAGS],
++[
++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
++ AC_REQUIRE([AC_LIB_RPATH])
++ define([Name],[translit([$1],[./-], [___])])
++ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
++ AC_LIB_LINKFLAGS_BODY([$1], [$2])
++ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
++ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
++ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+ ])
++ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
++ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
++ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
++ AC_SUBST([LIB]NAME)
++ AC_SUBST([LTLIB]NAME)
++ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
++ dnl results of this search when this library appears as a dependency.
++ HAVE_LIB[]NAME=yes
++ undefine([Name])
++ undefine([NAME])
++])
+
-AC_DEFUN(AC_FUNC_FSEEKO,
- [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
- ac_cv_sys_largefile_source,
@@ -437,7 +628,22 @@
- like early versions of FreeBSD and possibly contemporary NetBSD.)
- For shared mappings, we should conversely verify that changes get
- propogated back to all the places they're supposed to be.
--
++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
++dnl searches for libname and the libraries corresponding to explicit and
++dnl implicit dependencies, together with the specified include files and
++dnl the ability to compile and link the specified testcode. If found, it
++dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
++dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
++dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
++dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
++AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
++[
++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
++ AC_REQUIRE([AC_LIB_RPATH])
++ define([Name],[translit([$1],[./-], [___])])
++ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
- Grep wants private fixed already mapped.
- The main things grep needs to know about mmap are:
- * does it exist and is it safe to write into the mmap'd area
@@ -445,7 +651,10 @@
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
--
++ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
++ dnl accordingly.
++ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
-#if STDC_HEADERS || HAVE_STDLIB_H
-# include <stdlib.h>
-#else
@@ -457,14 +666,44 @@
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
--
++ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
++ dnl because if the user has installed lib[]Name and not disabled its use
++ dnl via --without-lib[]Name-prefix, he wants to use it.
++ ac_save_CPPFLAGS="$CPPFLAGS"
++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
-/* This mess was copied from the GNU getpagesize.h. */
-#if !HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h. */
-# if !HAVE_SYS_PARAM_H
-# define HAVE_SYS_PARAM_H 1
-# endif
--
++ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
++ ac_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIB[]NAME"
++ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
++ LIBS="$ac_save_LIBS"
++ ])
++ if test "$ac_cv_lib[]Name" = yes; then
++ HAVE_LIB[]NAME=yes
++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
++ AC_MSG_CHECKING([how to link with lib[]$1])
++ AC_MSG_RESULT([$LIB[]NAME])
++ else
++ HAVE_LIB[]NAME=no
++ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
++ dnl $INC[]NAME either.
++ CPPFLAGS="$ac_save_CPPFLAGS"
++ LIB[]NAME=
++ LTLIB[]NAME=
++ fi
++ AC_SUBST([HAVE_LIB]NAME)
++ AC_SUBST([LIB]NAME)
++ AC_SUBST([LTLIB]NAME)
++ undefine([Name])
++ undefine([NAME])
++])
+
-# ifdef _SC_PAGESIZE
-# define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
@@ -492,18 +731,482 @@
-# define getpagesize() 8192 /* punt totally */
-# endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
--
++dnl Determine the platform dependent parameters needed to use rpath:
++dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
++dnl hardcode_direct, hardcode_minus_L.
++AC_DEFUN([AC_LIB_RPATH],
++[
++ dnl Tell automake >= 1.10 to complain if config.rpath is missing.
++ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
++ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
++ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
++ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
++ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
++ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
++ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
++ . ./conftest.sh
++ rm -f ./conftest.sh
++ acl_cv_rpath=done
++ ])
++ wl="$acl_cv_wl"
++ libext="$acl_cv_libext"
++ shlibext="$acl_cv_shlibext"
++ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
++ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
++ hardcode_direct="$acl_cv_hardcode_direct"
++ hardcode_minus_L="$acl_cv_hardcode_minus_L"
++ dnl Determine whether the user wants rpath handling at all.
++ AC_ARG_ENABLE(rpath,
++ [ --disable-rpath do not hardcode runtime library paths],
++ :, enable_rpath=yes)
++])
+
-#endif /* no HAVE_GETPAGESIZE */
--
++dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
++dnl the libraries corresponding to explicit and implicit dependencies.
++dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
++AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
++[
++ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ dnl By default, look in $includedir and $libdir.
++ use_additional=yes
++ AC_LIB_WITH_FINAL_PREFIX([
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++ ])
++ AC_LIB_ARG_WITH([lib$1-prefix],
++[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
++ --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
++[
++ if test "X$withval" = "Xno"; then
++ use_additional=no
++ else
++ if test "X$withval" = "X"; then
++ AC_LIB_WITH_FINAL_PREFIX([
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++ ])
++ else
++ additional_includedir="$withval/include"
++ additional_libdir="$withval/lib"
++ fi
++ fi
++])
++ dnl Search the library and its dependencies in $additional_libdir and
++ dnl $LDFLAGS. Using breadth-first-seach.
++ LIB[]NAME=
++ LTLIB[]NAME=
++ INC[]NAME=
++ rpathdirs=
++ ltrpathdirs=
++ names_already_handled=
++ names_next_round='$1 $2'
++ while test -n "$names_next_round"; do
++ names_this_round="$names_next_round"
++ names_next_round=
++ for name in $names_this_round; do
++ already_handled=
++ for n in $names_already_handled; do
++ if test "$n" = "$name"; then
++ already_handled=yes
++ break
++ fi
++ done
++ if test -z "$already_handled"; then
++ names_already_handled="$names_already_handled $name"
++ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
++ dnl or AC_LIB_HAVE_LINKFLAGS call.
++ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
++ eval value=\"\$HAVE_LIB$uppername\"
++ if test -n "$value"; then
++ if test "$value" = yes; then
++ eval value=\"\$LIB$uppername\"
++ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
++ eval value=\"\$LTLIB$uppername\"
++ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
++ else
++ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
++ dnl that this library doesn't exist. So just drop it.
++ :
++ fi
++ else
++ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
++ dnl and the already constructed $LIBNAME/$LTLIBNAME.
++ found_dir=
++ found_la=
++ found_so=
++ found_a=
++ if test $use_additional = yes; then
++ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
++ found_dir="$additional_libdir"
++ found_so="$additional_libdir/lib$name.$shlibext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ else
++ if test -f "$additional_libdir/lib$name.$libext"; then
++ found_dir="$additional_libdir"
++ found_a="$additional_libdir/lib$name.$libext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ for x in $LDFLAGS $LTLIB[]NAME; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ case "$x" in
++ -L*)
++ dir=`echo "X$x" | sed -e 's/^X-L//'`
++ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
++ found_dir="$dir"
++ found_so="$dir/lib$name.$shlibext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ else
++ if test -f "$dir/lib$name.$libext"; then
++ found_dir="$dir"
++ found_a="$dir/lib$name.$libext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ fi
++ fi
++ ;;
++ esac
++ if test "X$found_dir" != "X"; then
++ break
++ fi
++ done
++ fi
++ if test "X$found_dir" != "X"; then
++ dnl Found the library.
++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
++ if test "X$found_so" != "X"; then
++ dnl Linking with a shared library. We attempt to hardcode its
++ dnl directory into the executable's runpath, unless it's the
++ dnl standard /usr/lib.
++ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
++ dnl No hardcoding is needed.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
++ else
++ dnl Use an explicit option to hardcode DIR into the resulting
++ dnl binary.
++ dnl Potentially add DIR to ltrpathdirs.
++ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $found_dir"
++ fi
++ dnl The hardcoding into $LIBNAME is system dependent.
++ if test "$hardcode_direct" = yes; then
++ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
++ dnl resulting binary.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
++ else
++ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
++ dnl Use an explicit option to hardcode DIR into the resulting
++ dnl binary.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
++ dnl Potentially add DIR to rpathdirs.
++ dnl The rpathdirs will be appended to $LIBNAME at the end.
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $found_dir"
++ fi
++ else
++ dnl Rely on "-L$found_dir".
++ dnl But don't add it if it's already contained in the LDFLAGS
++ dnl or the already constructed $LIBNAME
++ haveit=
++ for x in $LDFLAGS $LIB[]NAME; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-L$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
++ fi
++ if test "$hardcode_minus_L" != no; then
++ dnl FIXME: Not sure whether we should use
++ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
++ dnl here.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
++ else
++ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
++ dnl here, because this doesn't fit in flags passed to the
++ dnl compiler. So give up. No hardcoding. This affects only
++ dnl very old systems.
++ dnl FIXME: Not sure whether we should use
++ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
++ dnl here.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
++ fi
++ fi
++ fi
++ fi
++ else
++ if test "X$found_a" != "X"; then
++ dnl Linking with a static library.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
++ else
++ dnl We shouldn't come here, but anyway it's good to have a
++ dnl fallback.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
++ fi
++ fi
++ dnl Assume the include files are nearby.
++ additional_includedir=
++ case "$found_dir" in
++ */lib | */lib/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
++ additional_includedir="$basedir/include"
++ ;;
++ esac
++ if test "X$additional_includedir" != "X"; then
++ dnl Potentially add $additional_includedir to $INCNAME.
++ dnl But don't add it
++ dnl 1. if it's the standard /usr/include,
++ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
++ dnl 3. if it's already present in $CPPFLAGS or the already
++ dnl constructed $INCNAME,
++ dnl 4. if it doesn't exist as a directory.
++ if test "X$additional_includedir" != "X/usr/include"; then
++ haveit=
++ if test "X$additional_includedir" = "X/usr/local/include"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ for x in $CPPFLAGS $INC[]NAME; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-I$additional_includedir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_includedir"; then
++ dnl Really add $additional_includedir to $INCNAME.
++ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
++ fi
++ fi
++ fi
++ fi
++ fi
++ dnl Look for dependencies.
++ if test -n "$found_la"; then
++ dnl Read the .la file. It defines the variables
++ dnl dlname, library_names, old_library, dependency_libs, current,
++ dnl age, revision, installed, dlopen, dlpreopen, libdir.
++ save_libdir="$libdir"
++ case "$found_la" in
++ */* | *\\*) . "$found_la" ;;
++ *) . "./$found_la" ;;
++ esac
++ libdir="$save_libdir"
++ dnl We use only dependency_libs.
++ for dep in $dependency_libs; do
++ case "$dep" in
++ -L*)
++ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
++ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
++ dnl But don't add it
++ dnl 1. if it's the standard /usr/lib,
++ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
++ dnl 3. if it's already present in $LDFLAGS or the already
++ dnl constructed $LIBNAME,
++ dnl 4. if it doesn't exist as a directory.
++ if test "X$additional_libdir" != "X/usr/lib"; then
++ haveit=
++ if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ haveit=
++ for x in $LDFLAGS $LIB[]NAME; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ dnl Really add $additional_libdir to $LIBNAME.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
++ fi
++ fi
++ haveit=
More information about the pkg-emacs-commits
mailing list