diff options
Diffstat (limited to 'm4/lib-link.m4')
-rw-r--r-- | m4/lib-link.m4 | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index eeb200d2..ea0b0c4e 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 | |||
@@ -1,13 +1,13 @@ | |||
1 | # lib-link.m4 serial 4 (gettext-0.12) | 1 | # lib-link.m4 serial 6 (gettext-0.14.3) |
2 | dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. |
3 | dnl This file is free software, distributed under the terms of the GNU | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl General Public License. As a special exception to the GNU General | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl Public License, this file may be distributed as part of a program | 5 | dnl with or without modifications, as long as this notice is preserved. |
6 | dnl that contains a configuration script generated by Autoconf, under | ||
7 | dnl the same distribution terms as the rest of that program. | ||
8 | 6 | ||
9 | dnl From Bruno Haible. | 7 | dnl From Bruno Haible. |
10 | 8 | ||
9 | AC_PREREQ(2.50) | ||
10 | |||
11 | dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and | 11 | dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and |
12 | dnl the libraries corresponding to explicit and implicit dependencies. | 12 | dnl the libraries corresponding to explicit and implicit dependencies. |
13 | dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and | 13 | dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and |
@@ -95,6 +95,8 @@ dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, | |||
95 | dnl hardcode_direct, hardcode_minus_L. | 95 | dnl hardcode_direct, hardcode_minus_L. |
96 | AC_DEFUN([AC_LIB_RPATH], | 96 | AC_DEFUN([AC_LIB_RPATH], |
97 | [ | 97 | [ |
98 | dnl Tell automake >= 1.10 to complain if config.rpath is missing. | ||
99 | m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) | ||
98 | AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS | 100 | AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS |
99 | AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld | 101 | AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld |
100 | AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host | 102 | AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host |
@@ -350,7 +352,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | |||
350 | if test "X$additional_includedir" = "X/usr/local/include"; then | 352 | if test "X$additional_includedir" = "X/usr/local/include"; then |
351 | if test -n "$GCC"; then | 353 | if test -n "$GCC"; then |
352 | case $host_os in | 354 | case $host_os in |
353 | linux*) haveit=yes;; | 355 | linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
354 | esac | 356 | esac |
355 | fi | 357 | fi |
356 | fi | 358 | fi |
@@ -399,7 +401,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | |||
399 | if test "X$additional_libdir" = "X/usr/local/lib"; then | 401 | if test "X$additional_libdir" = "X/usr/local/lib"; then |
400 | if test -n "$GCC"; then | 402 | if test -n "$GCC"; then |
401 | case $host_os in | 403 | case $host_os in |
402 | linux*) haveit=yes;; | 404 | linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
403 | esac | 405 | esac |
404 | fi | 406 | fi |
405 | fi | 407 | fi |