Index: configure.in
===================================================================
RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/configure.in,v
retrieving revision 1.565
diff -u -w -r1.565 configure.in
--- configure.in	2002/08/06 23:19:40	1.565
+++ configure.in	2002/08/07 15:59:51
@@ -37,6 +37,7 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_YACC
+AC_PROG_EGREP
 
 AC_CHECK_PROGS(SYMORDER, symorder, :)
 AC_CHECK_PROGS(MAKEINFO, makeinfo, :)
@@ -1882,7 +1883,7 @@
 # Libtool vs automake stuff
 #
 
-LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/\.lo/g'`
+LTLIBOBJS=`echo "$LIB@&t@OBJS" | sed 's/\.o/\.lo/g'`
 AC_SUBST(LTLIBOBJS)
 
 # Almost done....
Index: cf/broken.m4
===================================================================
RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/cf/broken.m4,v
retrieving revision 1.2
diff -u -w -r1.2 broken.m4
--- cf/broken.m4	2002/04/23 20:40:11	1.2
+++ cf/broken.m4	2002/08/07 15:59:51
@@ -9,10 +9,9 @@
 do
 AC_CHECK_FUNC($ac_func, [
 ac_tr_func=HAVE_[]upcase($ac_func)
-AC_DEFINE_UNQUOTED($ac_tr_func)],[LIBOBJS[]="$LIBOBJS ${ac_func}.o"])
+AC_DEFINE_UNQUOTED($ac_tr_func)],[LIB@&t@OBJS[]="$LIB@&t@OBJS ${ac_func}.o"])
 if false; then
 	AC_CHECK_FUNCS($1)
 fi
 done
-AC_SUBST(LIBOBJS)dnl
 ])
Index: cf/broken2.m4
===================================================================
RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/cf/broken2.m4,v
retrieving revision 1.2
diff -u -w -r1.2 broken2.m4
--- cf/broken2.m4	2002/04/23 20:40:11	1.2
+++ cf/broken2.m4	2002/08/07 15:59:51
@@ -25,11 +25,10 @@
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
-  LIBOBJS[]="$LIBOBJS ${ac_func}.o"
+  LIB@&t@OBJS[]="$LIB@&t@OBJS ${ac_func}.o"
 fi
 done
 if false; then
 	AC_CHECK_FUNCS($1)
 fi
-AC_SUBST(LIBOBJS)dnl
 ])
Index: cf/find-if-not-broken.m4
===================================================================
RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/cf/find-if-not-broken.m4,v
retrieving revision 1.2
diff -u -w -r1.2 find-if-not-broken.m4
--- cf/find-if-not-broken.m4	2002/04/23 20:40:14	1.2
+++ cf/find-if-not-broken.m4	2002/08/07 15:59:51
@@ -7,7 +7,6 @@
 AC_DEFUN(AC_FIND_IF_NOT_BROKEN,
 [AC_FIND_FUNC([$1], [$2], [$3], [$4])
 if eval "test \"$ac_cv_func_$1\" != yes"; then
-LIBOBJS[]="$LIBOBJS $1.o"
+LIB@&t@OBJS[]="$LIB@&t@OBJS $1.o"
 fi
-AC_SUBST(LIBOBJS)dnl
 ])
Index: cf/krb-func-getcwd-broken.m4
===================================================================
RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/cf/krb-func-getcwd-broken.m4,v
retrieving revision 1.2
diff -u -w -r1.2 krb-func-getcwd-broken.m4
--- cf/krb-func-getcwd-broken.m4	2002/04/23 20:40:15	1.2
+++ cf/krb-func-getcwd-broken.m4	2002/08/07 15:59:51
@@ -32,8 +32,7 @@
 ])
 if test "$ac_cv_func_getcwd_broken" = yes; then
 	AC_DEFINE(BROKEN_GETCWD, 1, [Define if getcwd is broken (like in SunOS 4).])dnl
-	LIBOBJS="$LIBOBJS getcwd.o"
-	AC_SUBST(LIBOBJS)dnl
+	LIB@&t@OBJS="$LIB@&t@OBJS getcwd.o"
 	AC_MSG_RESULT($ac_cv_func_getcwd_broken)
 else
 	AC_MSG_RESULT([seems ok])
Index: cf/roken-frag.m4
===================================================================
RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/cf/roken-frag.m4,v
retrieving revision 1.2
diff -u -w -r1.2 roken-frag.m4
--- cf/roken-frag.m4	2002/04/23 20:40:18	1.2
+++ cf/roken-frag.m4	2002/08/07 15:59:51
@@ -149,7 +149,7 @@
 
 AC_BROKEN_GLOB
 if test "$ac_cv_func_glob_working" != yes; then
-	LIBOBJS="$LIBOBJS glob.o"
+	LIB@&t@OBJS="$LIB@&t@OBJS glob.o"
 fi
 AM_CONDITIONAL(have_glob_h, test "$ac_cv_func_glob_working" = yes)
 
@@ -184,7 +184,7 @@
 ])
 
 if test "$ac_cv_func_cgetent" = no; then
-	LIBOBJS="$LIBOBJS getcap.o"
+	LIB@&t@OBJS="$LIB@&t@OBJS getcap.o"
 fi
 
 AC_REQUIRE([AC_FUNC_GETLOGIN])
@@ -404,14 +404,14 @@
 if test "$ac_cv_func_getnameinfo" = "yes"; then
   rk_BROKEN_GETNAMEINFO
   if test "$ac_cv_func_getnameinfo_broken" = yes; then
-    LIBOBJS="$LIBOBJS getnameinfo.o"
+    LIB@&t@OBJS="$LIB@&t@OBJS getnameinfo.o"
   fi
 fi
 
 if test "$ac_cv_func_getaddrinfo" = "yes"; then
   rk_BROKEN_GETADDRINFO
   if test "$ac_cv_func_getaddrinfo_numserv" = no; then
-    LIBOBJS="$LIBOBJS getaddrinfo.o freeaddrinfo.o"
+    LIB@&t@OBJS="$LIB@&t@OBJS getaddrinfo.o freeaddrinfo.o"
   fi
 fi