diff options
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | configure.in | 11 |
2 files changed, 2 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 755c00aad0..03ae0557c0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -49,6 +49,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ 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 @@ AC_DEFUN(APACHE_GEN_MAKEFILES,[ $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. diff --git a/configure.in b/configure.in index 542d2cfa02..6246b5aee0 100644 --- a/configure.in +++ b/configure.in @@ -104,13 +104,13 @@ case "$host_alias" in 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 @@ dnl ## Check for programs 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 AC_PATH_PROG(PERL_PATH, perl) dnl various OS checks that apparently set required flags AC_AIX -AC_ISC_POSIX AC_MINIX dnl ## Check for libraries @@ -205,12 +202,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 ""' |