[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
290-gary-pmake-dot-slash-ignorance.diff
From: |
Gary V. Vaughan |
Subject: |
290-gary-pmake-dot-slash-ignorance.diff |
Date: |
Mon, 03 Oct 2005 21:21:33 +0100 |
User-agent: |
quilt/0.42-1 |
This should fix the ./foo != foo bogosity with pmake... untested!
Okay to commit?
libltdl/m4/ltdl.m4 | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
Index: libtool--devo--1.0/ChangeLog
from Gary V. Vaughan <address@hidden>
* libltdl/m4/ltdl.m4 (_LT_CONFIG_LTDL_DIR): Spurious './' prefixes
upset BSD pmake, don't set lt_ltdl_dir in this case.
(LTDL_CONVENIENCE, LTDL_INSTALLABLE): Adjust.
Index: libtool--devo--1.0/libltdl/m4/ltdl.m4
===================================================================
--- libtool--devo--1.0.orig/libltdl/m4/ltdl.m4
+++ libtool--devo--1.0/libltdl/m4/ltdl.m4
@@ -19,10 +19,14 @@ _$0($*)
# We break this out into a separate macro, so that we can call it safely
# internally without being caught accidentally by the sed scan in libtoolize.
m4_defun([_LT_CONFIG_LTDL_DIR],
-[m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$]))
+[dnl remove trailing slashes
+m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$]))
m4_case(_LTDL_DIR,
- [], [m4_define([_LTDL_DIR], _ARG_DIR)
- _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])],
+ [], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply `.'
+ m4_if(_ARG_DIR, [.],
+ [],
+ [m4_define([_LTDL_DIR], _ARG_DIR)
+ _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])])],
[m4_if(_ARG_DIR, _LTDL_DIR,
[],
[m4_fatal([multiple libltdl directories: `]_LTDL_DIR[',
`]_ARG_DIR['])])])
@@ -57,8 +61,8 @@ case $enable_ltdl_convenience in
"") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
-LIBLTDL='${top_builddir}/'"$lt_ltdl_dir/libltdlc.la"
-LTDLINCL='-I${top_srcdir}/'"$lt_ltdl_dir"
+LIBLTDL='${top_builddir}'"${lt_ltdl_dir+/$lt_ltdl_dir}/libltdlc.la"
+LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
AC_SUBST([LIBLTDL])
AC_SUBST([LTDLINCL])
@@ -108,8 +112,8 @@ AC_CHECK_LIB(ltdl, lt_dlinit,
])
if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install"
- LIBLTDL='${top_builddir}/'"$lt_ltdl_dir/libltdl.la"
- LTDLINCL='-I${top_srcdir}/'"$lt_ltdl_dir"
+ LIBLTDL='${top_builddir}'"${lt_ltdl_dir+/$lt_ltdl_dir}/libltdl.la"
+ LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl"
--
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
- 290-gary-pmake-dot-slash-ignorance.diff,
Gary V. Vaughan <=