You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fi...@apache.org on 2001/05/11 09:10:29 UTC
cvs commit: httpd-2.0 acinclude.m4 configure.in
fielding 01/05/11 00:10:28
Modified: . acinclude.m4 configure.in
Log:
We don't need no stinkin libtool when APR already has one for us to use.
Revision Changes Path
1.85 +1 -5 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- acinclude.m4 2001/05/10 21:54:00 1.84
+++ acinclude.m4 2001/05/11 07:10:21 1.85
@@ -49,6 +49,7 @@
APACHE_SUBST(prefix)
APACHE_SUBST(AWK)
APACHE_SUBST(CC)
+ APACHE_SUBST(CPP)
APACHE_SUBST(CXX)
APACHE_SUBST(CPPFLAGS)
APACHE_SUBST(CFLAGS)
@@ -97,11 +98,6 @@
$SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES
])
-AC_DEFUN(APACHE_LIBTOOL_SILENT,[
- LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-])
-
-
dnl ## APACHE_OUTPUT(file)
dnl ## adds "file" to the list of files generated by AC_OUTPUT
dnl ## This macro can be used several times.
1.147 +1 -10 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- configure.in 2001/05/09 13:13:06 1.146
+++ configure.in 2001/05/11 07:10:24 1.147
@@ -104,13 +104,13 @@
other_targets="$other_targets os2core"
;;
*)
+ LIBTOOL='$(SHELL) $(top_builddir)/srclib/apr/libtool --silent'
SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool --silent'
;;
esac
dnl
dnl ## Preload our OS configuration
-APR_PRELOAD
APACHE_PRELOAD
dnl
@@ -123,8 +123,6 @@
AC_PATH_PROG(RM, rm)
AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_CHECK_TOOL(RANLIB, ranlib, true)
@@ -132,7 +130,6 @@
dnl various OS checks that apparently set required flags
AC_AIX
-AC_ISC_POSIX
AC_MINIX
dnl ## Check for libraries
@@ -204,12 +201,6 @@
APACHE_SUBST(OS)
APACHE_SUBST(OS_DIR)
APACHE_SUBST(BUILTIN_LIBS)
-
-AM_DISABLE_SHARED
-if test -z "$LIBTOOL"; then
- AM_PROG_LIBTOOL
- APACHE_LIBTOOL_SILENT
-fi
PRE_SHARED_CMDS='echo ""'
POST_SHARED_CMDS='echo ""'