Commit 431f9853 authored by Roy T. Fielding's avatar Roy T. Fielding
Browse files

We don't need no stinkin libtool when APR already has one for us to use. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89079 13f79535-47bb-0310-9956-ffa450edef68
parent e1b48b23

acinclude.m4

+1 −5
Original line number Diff line number Diff line
@@ -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.

configure.in

+1 −10
Original line number Diff line number Diff line
@@ -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 ""'