From 7ffd3ed39e7bc7f6fe978e3afb29bf5aaf381ee5 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sat, 24 Apr 2004 04:44:02 +0000 Subject: [PATCH] Start depending on perl for builds * aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Look for perl. * config/pre.in (PERL): New variable. * config/lib.in (lib$(LIB)$(SHLIBVEXT)): Use one perl invocation rather than n+1 sed invocations. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16266 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 4 ++++ src/aclocal.m4 | 1 + src/config/ChangeLog | 6 ++++++ src/config/lib.in | 9 +++------ src/config/pre.in | 1 + 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4851b0250..8b7e7aa4a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-04-24 Ken Raeburn + + * aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Look for perl. + 2004-04-22 Ken Raeburn * aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute diff --git a/src/aclocal.m4 b/src/aclocal.m4 index e163dc29d..cf1fd8002 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1042,6 +1042,7 @@ AC_REQUIRE([AC_PROG_ARCHIVE])dnl AC_REQUIRE([AC_PROG_ARCHIVE_ADD])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl AC_CHECK_PROG(AR, ar, ar, false) +AC_CHECK_PROG(PERL, perl, false) AC_SUBST(LIBLIST) AC_SUBST(LIBLINKS) AC_SUBST(MAKE_SHLIB_COMMAND) diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 2328beb8e..fb7806973 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,9 @@ +2004-04-24 Ken Raeburn + + * pre.in (PERL): New variable. + * lib.in (lib$(LIB)$(SHLIBVEXT)): Use one perl invocation rather + than n+1 sed invocations. + 2004-04-22 Ken Raeburn * pre.in (DO_MAKE_SHLIB, SHLIB_STATIC_TARGET, LDCOMBINE, diff --git a/src/config/lib.in b/src/config/lib.in index 30c0f499d..c2fdc9cfc 100644 --- a/src/config/lib.in +++ b/src/config/lib.in @@ -42,12 +42,9 @@ lib$(LIB)$(STLIBEXT): $(STOBJLISTS) lib$(LIB)$(SHLIBVEXT): $(SHOBJLISTS) $(SHLIB_EXPDEPS) $(SHLIB_EXPORT_FILE_DEP) $(RM) $@ @echo "building shared $(LIB) library ($(LIBMAJOR).$(LIBMINOR))" - @dirs=`echo $(SHOBJLISTS) | \ - sed -e 's%/OBJS.SH%%g' -e 's%OBJS.SH%.%'`; \ - objlist=`for d in $$dirs; do \ - sed -e '/^$$/d' -e "s%^%$$d/%" -e "s% % $$d/%g" \ - $$d/OBJS.SH; done` ; \ - set -x ; $(MAKE_SHLIB_COMMAND) + @objlist=`set -x && $(PERL) -p -e '$$e=$$ARGV; $$e =~ s/OBJS.SH$$//; s/^/ /; s/ $$//; s/ / $$e/g;' $(SHOBJLISTS)` && \ + set -x && \ + $(MAKE_SHLIB_COMMAND) lib$(LIB)$(SHLIBSEXT): lib$(LIB)$(SHLIBVEXT) $(RM) $@ diff --git a/src/config/pre.in b/src/config/pre.in index c0d002c1b..00e59834a 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -248,6 +248,7 @@ AWK = @AWK@ LEX = @LEX@ LEXLIB = @LEXLIB@ YACC = @YACC@ +PERL = @PERL@ AUTOCONF = @AUTOCONF@ AUTOCONFFLAGS = @AUTOCONFFLAGS@ AUTOCONFINCFLAGS = @AUTOCONFINCFLAGS@ -- 2.26.2