Index: configure.in
===================================================================
RCS file: /cvs/guile/guile-core/configure.in,v
retrieving revision 1.157.2.16
diff -u -r1.157.2.16 configure.in
--- configure.in	4 Mar 2002 22:41:07 -0000	1.157.2.16
+++ configure.in	15 Mar 2002 16:13:26 -0000
@@ -132,22 +132,25 @@
 dnl files which are destined for separate modules.
 
 if test "$enable_arrays" = yes; then
-   LIBOBJS="$LIBOBJS ramap.o unif.o"
+   AC_LIBOBJ([ramap])
+   AC_LIBOBJ([unif])
    AC_DEFINE(HAVE_ARRAYS)
 fi
 
 if test "$enable_posix" = yes; then
-   LIBOBJS="$LIBOBJS filesys.o posix.o"
+   AC_LIBOBJ([filesys])
+   AC_LIBOBJ([posix])
    AC_DEFINE(HAVE_POSIX)
 fi
 
 if test "$enable_networking" = yes; then
-   LIBOBJS="$LIBOBJS net_db.o socket.o"
+   AC_LIBOBJ([net_db])
+   AC_LIBOBJ([socket])
    AC_DEFINE(HAVE_NETWORKING)
 fi
 
 if test "$enable_debug_malloc" = yes; then
-   LIBOBJS="$LIBOBJS debug-malloc.o"
+   AC_LIBOBJ([debug-malloc])
 fi
 
 #--------------------------------------------------------------------
@@ -408,9 +411,9 @@
    if test "$ac_cv_header_regex_h" = yes ||
       test "$ac_cv_header_rxposix_h" = yes ||
       test "$ac_cv_header_rx_rxposix_h" = yes; then
-     GUILE_NAMED_CHECK_FUNC(regcomp, norx, [LIBOBJS="regex-posix.o $LIBOBJS"],
+     GUILE_NAMED_CHECK_FUNC(regcomp, norx, AC_LIBOBJ([regex-posix]),
      [AC_CHECK_LIB(rx, main)
-      GUILE_NAMED_CHECK_FUNC(regcomp, rx, [LIBOBJS="regex-posix.o $LIBOBJS"])]
+      GUILE_NAMED_CHECK_FUNC(regcomp, rx, AC_LIBOBJ([regex-posix]))]
      )
      dnl The following should not be necessary, but for some reason
      dnl autoheader misses it if we don't include it!
@@ -427,7 +430,7 @@
 # explicitly to LIBOBJS to make sure that it is translated to
 # `alloca.lo' for libtool later on.  This can and should be done more cleanly.
 AC_FUNC_ALLOCA
-if test "$ALLOCA" = "alloca.o"; then LIBOBJS="alloca.o $LIBOBJS"; fi
+if test "$ALLOCA" = "alloca.o"; then AC_LIBOBJ([alloca]); fi
 
 AC_CHECK_MEMBERS([struct stat.st_rdev])
 AC_CHECK_MEMBERS([struct stat.st_blksize])
@@ -544,7 +547,7 @@
   AC_DEFINE(USE_THREADS, 1)
 
   ## Include the Guile thread interface in the library...
-  LIBOBJS="$LIBOBJS threads.o"
+  AC_LIBOBJ([threads])
 
   ## ... and tell it which package to talk to.
   case "${THREAD_PACKAGE}" in
@@ -589,11 +592,11 @@
 ## If we're creating a shared library (using libtool!), then we'll
 ## need to generate a list of .lo files corresponding to the .o files
 ## given in LIBOBJS.  We'll call it LIBLOBJS.
-LIBLOBJS="`echo ${LIBOBJS} | sed 's/\.o/.lo/g'`"
+LIBLOBJS="`echo ${LIB@&address@hidden | sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`"
 
 ## We also need to create corresponding .doc and .x files
-EXTRA_DOT_DOC_FILES="`echo ${LIBOBJS} | sed 's/\.o/.doc/g'`"
-EXTRA_DOT_X_FILES="`echo ${LIBOBJS} | sed 's/\.o/.x/g'`"
+EXTRA_DOT_DOC_FILES="`echo ${LIB@&address@hidden | sed 's,\.[[^.]]* ,.doc ,g;s,\.[[^.]]*$,.doc,'`"
+EXTRA_DOT_X_FILES="`echo ${LIB@&address@hidden | sed 's,\.[[^.]]* ,.x ,g;s,\.[[^.]]*$,.x,'`"
 
 AC_SUBST(GUILE_MAJOR_VERSION)
 AC_SUBST(GUILE_MINOR_VERSION)