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

diff --git a/src/ChangeLog b/src/ChangeLog
index 4851b0250709e1e9ebb040cbf7884c896ea179da..8b7e7aa4ae8107e119944e076618ce18cdae76d0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-24  Ken Raeburn  <raeburn@mit.edu>
+
+       * aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Look for perl.
+
 2004-04-22  Ken Raeburn  <raeburn@mit.edu>
 
        * aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index e163dc29dd9905d193c590197dd91f0c20724818..cf1fd80026780eccbf4d04dcb4bfc37fe02b00aa 100644 (file)
--- 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 2328beb8eb9cb6657a43812fb1a92acc7e773f9b..fb780697356b130a5582f4344f7ec58cf860618a 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-24  Ken Raeburn  <raeburn@mit.edu>
+
+       * 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  <raeburn@mit.edu>
 
        * pre.in (DO_MAKE_SHLIB, SHLIB_STATIC_TARGET, LDCOMBINE,

diff --git a/src/config/lib.in b/src/config/lib.in
index 30c0f499d7cac6a0a6b3361657b743b820163c50..c2fdc9cfcb0f6349b7930197d2f26afc4974cc6e 100644 (file)
--- 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 c0d002c1b0b32d0fb2f97df081a9c291d1208e6e..00e59834a320e47f31dfa7af2d4944a7eed404d0 100644 (file)
--- 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@