Commit 5ec0434c authored by Roy T. Fielding's avatar Roy T. Fielding
Browse files

Fix httpd's definition of LTFLAGS to be consistent with that of apr 

and apr-util, allow it to be overridden by the configure command-line
(default="--silent") and introduce LT_LDFLAGS to replace what we were
formally abusing as LTFLAGS.


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

CHANGES

+5 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.18-dev



  *) Fix httpd's definition of LTFLAGS to be consistent with that of apr

     and apr-util, allow it to be overridden by the configure command-line

     (default="--silent") and introduce LT_LDFLAGS to replace what we were

     formally abusing as LTFLAGS.  [Roy Fielding]



  *) Clean up the reporting of incorrect closing container tags.

     [Barrie Slaymaker <barries@slaysys.com>]

STATUS

+1 −6
Original line number Diff line number Diff line 
APACHE 2.0 STATUS:						-*-text-*-

Last modified at [$Date: 2001/05/07 16:59:05 $]

Last modified at [$Date: 2001/05/12 03:48:29 $]



Release:
@@ -310,11 +310,6 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: 
    * (possibly) port the bug fix for PR 6942 (segv when LoadModule is put

      into a VirtualHost container) to 2.0.



    * the LTFLAGS = -export-dynamic in the config.m4 is wrong. it is getting

      added multiple times during the config process. The -export-dynamic

      should probably move into build/special.mk (the make file used for

      building Apache modules).



    * shift stuff to mod_core.h



    * APR-ize resolver stuff in mod_unique_id (Jeff volunteers)

acinclude.m4

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ 
  APACHE_SUBST(CXXFLAGS)

  APACHE_SUBST(LTFLAGS)

  APACHE_SUBST(LDFLAGS)

  APACHE_SUBST(LT_LDFLAGS)

  APACHE_SUBST(SH_LDFLAGS)

  APACHE_SUBST(HTTPD_LDFLAGS)

  APACHE_SUBST(LIBS)

build/rules.mk

+3 −3
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@ 


# Link-related commands



LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(ALL_LDFLAGS) -o $@

SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) -o $@

MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(ALL_LDFLAGS) -o $@

LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@

SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) -o $@

MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@



# Cross compile commands

configure.in

+5 −2
Original line number Diff line number Diff line
@@ -103,8 +103,11 @@ case "$host_alias" in 
      other_targets="$other_targets os2core"

      ;;

  *)

      LIBTOOL='$(SHELL) $(top_builddir)/srclib/apr/libtool --silent'

      SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool --silent'

      if test "x$LTFLAGS" = "x"; then

          LTFLAGS='--silent'

      fi

      LIBTOOL='$(SHELL) $(top_builddir)/srclib/apr/libtool $(LTFLAGS)'

      SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'

      ;;

esac