]> Savannah Git Hosting - m4.git/commitdiff

Savannah Git Hosting - m4.git/commitdiff

git git@sv / m4.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2c19e82)

configury: remove vestigial libltdl references.

author Gary V. Vaughan <gary@gnu.org>

2014年11月21日 19:28:00 +0000 (19:28 +0000)

committer Gary V. Vaughan <gary@gnu.org>

2014年11月21日 19:28:00 +0000 (19:28 +0000)

M4 no longer uses libltdl.
* configure.ac: Call LT_LIB_DLLOAD to set LIBADD_DL correctly.
* Makefile.am (m4_libm4_la_LIBADD): Remove LIBLTDL.
(m4_libm4_la_DEPENDENCIES): Remove LTDLDEPS.
Reported by Pavel Raiskup

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

Makefile.am patch | blob | history

build-aux/m4/gnulib-cache.m4 patch | blob | history

configure.ac patch | blob | history

diff --git a/Makefile.am b/Makefile.am

index 86aada412445773d1830775f084132882b9d1608..7e3f1d850d76a45309f139a38e7a6964c343e820 100644 (file)

--- a/Makefile.am

+++ b/Makefile.am

@@ -246,8 +246,8 @@ m4_libm4_la_SOURCES = \

m4/syntax.c \

m4/utility.c

m4_libm4_la_LIBADD = m4/gnu/libgnu.la \

- $(LIBLTDL) $(LTLIBINTL) $(LIBADD_DL)

-m4_libm4_la_DEPENDENCIES = $(LTDLDEPS) m4/gnu/libgnu.la

+ $(LTLIBINTL) $(LIBADD_DL)

+m4_libm4_la_DEPENDENCIES = m4/gnu/libgnu.la

# This file needs to be regenerated at configure time.

dist-hook:

diff --git a/build-aux/m4/gnulib-cache.m4 b/build-aux/m4/gnulib-cache.m4

index 145b3da6826a980200c0159f6a718e4b2381f11d..a31e5666629ee17f22e484429167208bf7628d2c 100644 (file)

--- a/build-aux/m4/gnulib-cache.m4

+++ b/build-aux/m4/gnulib-cache.m4

@@ -1,4 +1,4 @@

-# Copyright (C) 2002-2014 Free Software Foundation, Inc.

+# Copyright (C) 2002-2013 Free Software Foundation, Inc.

#

# This file is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

diff --git a/configure.ac b/configure.ac

index 3f8167134b002a667a1298b7d16a082e2dbe9356..c32d0cf73324ccad803e33ff77f0cf9b3c5366a8 100644 (file)

--- a/configure.ac

+++ b/configure.ac

@@ -209,6 +209,7 @@ AC_SUBST([PREOPEN_DEPENDENCIES])

## Dynamic Loader Characteristics. ##

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

+LT_LIB_DLLOAD

LT_FUNC_DLSYM_USCORE

AC_DEFINE_UNQUOTED([PATH_SEPARATOR], ['$PATH_SEPARATOR'],

[Define this to system search path delimiter])

GNU M4 source repository