mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2024-11-21 01:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

* m4/libtool.m4 (LT_INIT): aclocal can't see AC_DEFUN_ONCE, so use

Browse Source 
AC_DEFUN and m4_define.
* libtoolize.in (func_serial): No longer accept AC_DEFUN_ONCE...
(func_grep): ...so mere grep is sufficient again...
(EGREP): ...and this is no longer required.
This commit is contained in:
Gary V. Vaughan 2004-03-30 08:29:52 +00:00
parent 8c301628d8
commit aa86d1dacc
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
2004-03-30 Gary V. Vaughan <gary@gnu.org> 2004-03-30 Gary V. Vaughan <gary@gnu.org>
* m4/libtool.m4 (LT_INIT): aclocal can't see AC_DEFUN_ONCE, so use
AC_DEFUN and m4_define.
* libtoolize.in (func_serial): No longer accept AC_DEFUN_ONCE...
(func_grep): ...so mere grep is sufficient again...
(EGREP): ...and this is no longer required.
2004-03-29 Gary V. Vaughan <gary@gnu.org>
* m4/libtool.m4: Use LT_INIT as #serial tag. * m4/libtool.m4: Use LT_INIT as #serial tag.
* libtoolize.in: Grok LT_INIT! Pass A[CM]_PROG_LIBTOOL to... * libtoolize.in: Grok LT_INIT! Pass A[CM]_PROG_LIBTOOL to...
(func_serial_update): ...here, we now take an additional parameter (func_serial_update): ...here, we now take an additional parameter

5
libtoolize.in
View File

@ -49,7 +49,6 @@
: ${CP="cp -f"} : ${CP="cp -f"}
: ${LN_S="@LN_S@"} : ${LN_S="@LN_S@"}
: ${EGREP="@EGREP@"}
: ${MKDIR="mkdir"} : ${MKDIR="mkdir"}
: ${RM="rm -f"} : ${RM="rm -f"}
: ${SED="@SED@"} : ${SED="@SED@"}
@ -315,7 +314,7 @@ func_copy_all_files ()
# Check whether EXPRESSION matches any line of FILENAME, without output. # Check whether EXPRESSION matches any line of FILENAME, without output.
func_grep () func_grep ()
{ {
$EGREP "$1" "$2" >/dev/null 2>&1 grep "$1" "$2" >/dev/null 2>&1
} }
# func_scan_files # func_scan_files
@ -461,7 +460,7 @@ func_serial ()
# in the file that AC_DEFUNs MACRO_REGEX. # in the file that AC_DEFUNs MACRO_REGEX.
my_serial= my_serial=
for my_file in `func_included_files "$my_filename"`; do for my_file in `func_included_files "$my_filename"`; do
if func_grep '^AC_DEFUN(_ONCE)?\(\['"$my_macro_regex" "$my_file"; then if func_grep '^AC_DEFUN\(\['"$my_macro_regex" "$my_file"; then
my_serial=`$SED -e "$my_sed_serial" "$my_file"` my_serial=`$SED -e "$my_sed_serial" "$my_file"`
break break
fi fi

5
m4/libtool.m4 vendored
View File

@ -43,7 +43,7 @@ m4_define([LT_PREREQ],
# LT_INIT([OPTIONS]) # LT_INIT([OPTIONS])
# -------------------------- # --------------------------
AC_DEFUN_ONCE([LT_INIT], AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
dnl Autoconf doesn't catch unexpanded LT_ macros by default: dnl Autoconf doesn't catch unexpanded LT_ macros by default:
m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
@ -67,6 +67,9 @@ AC_SUBST(LIBTOOL)dnl
_LT_SET_OPTIONS([$1])dnl _LT_SET_OPTIONS([$1])dnl
_LT_SETUP _LT_SETUP
# Only expand once:
m4_define([LT_INIT])
])# _LT_INIT ])# _LT_INIT
# Old names: # Old names: