[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
285-gary-diagnose-missing-LT_WITH_LTDL.diff
From: |
Gary V. Vaughan |
Subject: |
285-gary-diagnose-missing-LT_WITH_LTDL.diff |
Date: |
Fri, 30 Sep 2005 12:06:57 +0100 |
User-agent: |
quilt/0.42-1 |
Okay to commit?
libtoolize.m4sh | 62 ++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 31 deletions(-)
Index: libtool--devo--1.0/ChangeLog
from Gary V. Vaughan <address@hidden>
* libtoolize.m4sh: Move the consistency checks...
(func_check_macros): ...into here. Also suggest LT_WITH_LTDL if
appropriate.
Index: libtool--devo--1.0/libtoolize.m4sh
===================================================================
--- libtool--devo--1.0.orig/libtoolize.m4sh
+++ libtool--devo--1.0/libtoolize.m4sh
@@ -795,16 +795,40 @@ func_check_macros ()
{
$opt_debug
- $seen_autoconf \
- || return
+ $seen_autoconf || return
# Don't trace for this, we're just checking the user didn't invoke it
# directly from configure.ac.
- $SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB \
- && func_echo "\`AC_PROG_RANLIB' is rendered obsolete by \`LT_INIT'"
+ $SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB &&
+ func_echo "\`AC_PROG_RANLIB' is rendered obsolete by \`LT_INIT'"
- $seen_libtool \
- || func_echo "Remember to add \`LT_INIT' to \`$configure_ac'."
+ # Remind the user to call LT_CONFIG_LTDL_DIR:
+ $opt_ltdl && test -n "$ac_ltdldir" ||
+ func_echo "remember to add \`LT_CONFIG_LTDL_DIR([[$ltdldir]])' to
$configure_ac"
+
+ # Suggest modern idioms for storing autoconf macros:
+ test -n "$macrodir$ltdldir" ||
+ if test x"$m4dir" = x.; then
+ func_echo "add \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac to store
autoconf macros"
+ else
+ func_echo "consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to
$configure.ac"
+ fi
+
+ $seen_libtool ||
+ func_echo "remember to add \`LT_INIT' to $configure_ac."
+
+ $opt_ltdl && {
+ # Suggest using LT_WITH_LTDL if appropriate:
+ $seen_ltdl ||
+ func_echo "remember to add \`LT_WITH_LTDL' to $configure_ac"
+
+ # Offer some suggestions for avoiding duplicate files in a project
+ # that uses libltdl:
+ test "$ltdldir/config" = "$auxdir" ||
+ func_echo "consider using \`AC_CONFIG_AUX_DIR([[$ltdldir/config]])' in
$configure_ac"
+ test "$ltdldir/m4" = "$m4dir" ||
+ func_echo "consider using \`AC_CONFIG_MACRO_DIR([[$ltdldir/m4]])' in
$configure_ac"
+ }
# FIXME: Ensure ltmain.sh, libtool.m4 and ltdl.m4 are from the same release
}
@@ -942,7 +966,6 @@ func_nonemptydir_p ()
glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'
func_scan_files
- $opt_quiet || func_check_macros
# Copy all the files from installed libltdl to this project, if the
# user specified `--ltdl'.
@@ -1005,30 +1028,7 @@ func_nonemptydir_p ()
}
fi
- # Suggest modern idioms for storing autoconf macros:
- $opt_quiet || \
- if test -z "$macrodir$ltdldir" && $seen_autoconf; then
- if test x"$m4dir" = x.; then
- func_echo "add \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac to store
autoconf macros"
- else
- func_echo "consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to
$configure.ac"
- fi
- fi
-
- $opt_quiet || \
- if $opt_ltdl && $seen_autoconf; then
-
- # Remind the user to call LT_CONFIG_LTDL_DIR:
- test -n "$ac_ltdldir" || \
- func_echo "Remember to add \`LT_CONFIG_LTDL_DIR([[$ltdldir]])' to
\`$configure_ac'"
-
- # Offer some suggestions for avoiding duplicate files in a project
- # that uses libltdl:
- test "$ltdldir/config" = "$auxdir" || \
- func_echo "consider using \`AC_CONFIG_AUX_DIR([[$ltdldir/config]])' in
$configure_ac"
- test "$ltdldir/m4" = "$m4dir" || \
- func_echo "consider using \`AC_CONFIG_MACRO_DIR([[$ltdldir/m4]])' in
$configure_ac"
- fi
+ $opt_quiet || func_check_macros
}
exit $exit_status
--
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
- 285-gary-diagnose-missing-LT_WITH_LTDL.diff,
Gary V. Vaughan <=