[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: 334-gary-resolve-_LTDL_SETUP-clash.patch
|
From: |
Gary V. Vaughan |
|
Subject: |
FYI: 334-gary-resolve-_LTDL_SETUP-clash.patch |
|
Date: |
Tue, 8 Jan 2008 13:08:05 +0800 (PHT) |
|
User-agent: |
mailnotify/0.9 |
Applied to HEAD.
Index: ChangeLog
from Gary V. Vaughan <address@hidden>
* tests/configure-iface.at, tests/nonrecursive.at,
tests/recursive.at, tests/subproject.at (_LTDL_SETUP):
Renamed to _LT_AT_LTDL_SETUP to avoid a nameclash with
libltdl/m4/ltoptions.m4:_LTDL_SETUP from yesterday's patch.
Reported by Ralf Wildenhues <address@hidden>
Index: tests/configure-iface.at
===================================================================
RCS file: /sources/libtool/libtool/tests/configure-iface.at,v
retrieving revision 1.1
diff -u -u -r1.1 configure-iface.at
--- tests/configure-iface.at 6 Jan 2008 16:33:31 -0000 1.1
+++ tests/configure-iface.at 8 Jan 2008 05:06:57 -0000
@@ -24,9 +24,9 @@
AT_BANNER([configure interface to libltdl.])
-# _LTDL_SETUP
-# -----------
-m4_pushdef([_LTDL_SETUP],
+# _LT_AT_LTDL_SETUP
+# -----------------
+m4_pushdef([_LT_AT_LTDL_SETUP],
[AT_DATA([main.c],
[[#include <ltdl.h>
#include <stdio.h>
@@ -92,7 +92,7 @@
AT_DATA([expout],
[[5150
]])
-])# _LTDL_SETUP
+])# _LT_AT_LTDL_SETUP
## -------------------- ##
@@ -102,7 +102,7 @@
AT_SETUP([installable libltdl])
AT_KEYWORDS([libltdl])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
AT_DATA([configure.ac],
[[AC_INIT([installable-ltdl-demo], ]AT_PACKAGE_VERSION[,
]AT_PACKAGE_BUGREPORT[)
@@ -169,7 +169,7 @@
AT_CHECK([test -f $prefix/lib/libltdl.la])
AT_CHECK([test -f $prefix/include/ltdl.h])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
AT_DATA([configure.ac],
[[AC_INIT([configure-iface-demo], ]AT_PACKAGE_VERSION[,
]AT_PACKAGE_BUGREPORT[)
@@ -218,7 +218,7 @@
AT_SETUP([--with-included-ltdl])
AT_KEYWORDS([libltdl])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
AT_DATA([configure.ac],
[[AC_INIT([configure-iface-demo], ]AT_PACKAGE_VERSION[,
]AT_PACKAGE_BUGREPORT[)
@@ -264,4 +264,4 @@
AT_CLEANUP
dnl Be careful not to let the definition leak into other tests
-m4_popdef([_LTDL_SETUP])
+m4_popdef([_LT_AT_LTDL_SETUP])
Index: tests/nonrecursive.at
===================================================================
RCS file: /sources/libtool/libtool/tests/nonrecursive.at,v
retrieving revision 1.10
diff -u -u -r1.10 nonrecursive.at
--- tests/nonrecursive.at 6 Jan 2008 16:33:31 -0000 1.10
+++ tests/nonrecursive.at 8 Jan 2008 05:06:57 -0000
@@ -25,9 +25,9 @@
AT_BANNER([Nonrecursive Automake Libltdl.])
-# _LTDL_SETUP
-# -----------
-m4_pushdef([_LTDL_SETUP],
+# _LT_AT_LTDL_SETUP
+# -----------------
+m4_pushdef([_LT_AT_LTDL_SETUP],
[AT_DATA([configure.ac],
[[AC_INIT([subdirectory-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
LT_CONFIG_LTDL_DIR([ltdl])
@@ -69,7 +69,7 @@
]])
echo 'int dummy = 0;' > foo.c
-])# _LTDL_SETUP
+])# _LT_AT_LTDL_SETUP
## ------------------------ ##
## Softlinked libltdl tree. ##
@@ -77,7 +77,7 @@
AT_SETUP([compiling softlinked libltdl])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
LT_AT_LIBTOOLIZE([--ltdl])
AT_CHECK([if test -f ltdl/configure.ac; then false; fi])
@@ -101,7 +101,7 @@
AT_SETUP([compiling copied libltdl])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
LT_AT_LIBTOOLIZE([--copy --ltdl])
AT_CHECK([if test -f ltdl/configure.ac; then false; fi])
@@ -125,7 +125,7 @@
AT_SETUP([installable libltdl])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
prefix=`pwd`/_inst
@@ -146,4 +146,4 @@
AT_CLEANUP
dnl Be careful not to let the definition leak into other tests
-m4_popdef([_LTDL_SETUP])
+m4_popdef([_LT_AT_LTDL_SETUP])
Index: tests/recursive.at
===================================================================
RCS file: /sources/libtool/libtool/tests/recursive.at,v
retrieving revision 1.7
diff -u -u -r1.7 recursive.at
--- tests/recursive.at 6 Jan 2008 16:33:31 -0000 1.7
+++ tests/recursive.at 8 Jan 2008 05:06:57 -0000
@@ -24,9 +24,9 @@
AT_BANNER([Recursive Automake Libltdl.])
-# _LTDL_SETUP
-# -----------
-m4_pushdef([_LTDL_SETUP],
+# _LT_AT_LTDL_SETUP
+# -----------------
+m4_pushdef([_LT_AT_LTDL_SETUP],
[AT_DATA([configure.ac],
[[AC_INIT([subdirectory-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
LT_CONFIG_LTDL_DIR([ltdl])
@@ -51,7 +51,7 @@
]])
echo 'int dummy = 0;' > foo.c
-])# _LTDL_SETUP
+])# _LT_AT_LTDL_SETUP
## ------------------------ ##
## Softlinked libltdl tree. ##
@@ -59,7 +59,7 @@
AT_SETUP([compiling softlinked libltdl])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
LT_AT_LIBTOOLIZE([--ltdl])
AT_CHECK([if test -f ltdl/configure.ac; then false; fi])
@@ -79,7 +79,7 @@
AT_SETUP([compiling copied libltdl])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
LT_AT_LIBTOOLIZE([--debug --copy --ltdl])
AT_CHECK([if test -f ltdl/configure.ac; then false; fi])
@@ -99,7 +99,7 @@
AT_SETUP([installable libltdl])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
prefix=`pwd`/_inst
@@ -116,4 +116,4 @@
AT_CLEANUP
dnl Be careful not to let the definition leak into other tests
-m4_popdef([_LTDL_SETUP])
+m4_popdef([_LT_AT_LTDL_SETUP])
Index: tests/subproject.at
===================================================================
RCS file: /sources/libtool/libtool/tests/subproject.at,v
retrieving revision 1.12
diff -u -u -r1.12 subproject.at
--- tests/subproject.at 25 Mar 2007 12:12:43 -0000 1.12
+++ tests/subproject.at 8 Jan 2008 05:06:57 -0000
@@ -24,9 +24,9 @@
AT_BANNER([Subproject Libltdl.])
-# _LTDL_SETUP
-# -----------
-m4_pushdef([_LTDL_SETUP],
+# _LT_AT_LTDL_SETUP
+# -----------------
+m4_pushdef([_LT_AT_LTDL_SETUP],
[AT_DATA([configure.ac],
[[AC_INIT([subproject-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
LT_CONFIG_LTDL_DIR([sub/ltdl])
@@ -48,7 +48,7 @@
]])
echo 'int dummy = 0;' > foo.c
-])# _LTDL_SETUP
+])# _LT_AT_LTDL_SETUP
## ------------------------ ##
## Softlinked libltdl tree. ##
@@ -56,7 +56,7 @@
AT_SETUP([compiling softlinked libltdl])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
LT_AT_BOOTSTRAP([--ltdl], [-I sub/ltdl/m4], [ignore], [--add-missing --copy],
[], [], [all $tst_dist])
@@ -72,7 +72,7 @@
AT_SETUP([compiling copied libltdl])
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore],
[--add-missing --copy], [], [], [all $tst_dist])
@@ -90,7 +90,7 @@
prefix=`pwd`/_inst
-_LTDL_SETUP
+_LT_AT_LTDL_SETUP
LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore],
[--add-missing --copy], [], [--enable-ltdl-install --prefix=$prefix],
@@ -119,4 +119,4 @@
AT_CLEANUP
dnl Be careful not to let the definition leak into other tests
-m4_popdef([_LTDL_SETUP])
+m4_popdef([_LT_AT_LTDL_SETUP])
--
())_. Email me: address@hidden
( '/ Read my blog: http://blog.azazil.net
/ )= ...and my book: http://sources.redhat.com/autobook
`(_~)_ Join my AGLOCO Network: http://www.agloco.com/r/BBBS7912
_________________________________________________________
This patch notification generated by vcsapply version 1.0
http://savannah.gnu.org/projects/cvs-utils
pgpRqAvQh1WlF.pgp
Description: PGP signature
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: 334-gary-resolve-_LTDL_SETUP-clash.patch,
Gary V. Vaughan <=