httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: httpd-2.0/test Makefile.in
Date Wed, 10 Jan 2001 01:04:54 GMT
bjh         01/01/09 17:04:54

  Modified:    .        configure.in
               os       config.m4
               support  Makefile.in
               test     Makefile.in
  Log:
  Libtool takes care of the lib prefix so get rid of our own workaround.
  
  Revision  Changes    Path
  1.115     +1 -2      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- configure.in	2001/01/09 19:28:33	1.114
  +++ configure.in	2001/01/10 01:04:52	1.115
  @@ -150,7 +150,6 @@
   APACHE_SUBST(OS)
   APACHE_SUBST(OS_DIR)
   APACHE_SUBST(BUILTIN_LIBS)
  -APACHE_SUBST(LIBPRE)
   
   AM_DISABLE_SHARED
   AM_PROG_LIBTOOL
  @@ -213,7 +212,7 @@
   fi
   
   dnl APR should go after the other libs, so the right symbols can be picked up
  -AP_LIBS="$AP_LIBS srclib/apr/\$(LIBPRE)apr.la"
  +AP_LIBS="$AP_LIBS srclib/apr/libapr.la"
   APACHE_SUBST(AP_LIB_DIRS)
   APACHE_SUBST(AP_LIBS)
   
  
  
  
  1.10      +0 -2      httpd-2.0/os/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/config.m4,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- config.m4	2000/10/05 04:41:47	1.9
  +++ config.m4	2001/01/10 01:04:53	1.10
  @@ -2,7 +2,6 @@
   
   #PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`
   PLATFORM=$host
  -LIBPRE=lib
   
   case "$PLATFORM" in
   *beos*)
  @@ -10,7 +9,6 @@
     OS_DIR=$OS
     ;;
   *pc-os2_emx*)
  -  LIBPRE=""
     OS="os2"
     OS_DIR=$OS
     ;;
  
  
  
  1.12      +1 -1      httpd-2.0/support/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.in	2001/01/09 16:35:08	1.11
  +++ Makefile.in	2001/01/10 01:04:53	1.12
  @@ -5,7 +5,7 @@
   
   PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
   PROGRAM_DEPENDENCIES = \
  -	../srclib/apr-util/libaprutil.la ../srclib/apr/$(LIBPRE)apr.la
  +	../srclib/apr-util/libaprutil.la ../srclib/apr/libapr.la
   
   include $(top_srcdir)/build/rules.mk
   
  
  
  
  1.6       +1 -1      httpd-2.0/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/test/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	2000/12/08 23:19:27	1.5
  +++ Makefile.in	2001/01/10 01:04:53	1.6
  @@ -7,7 +7,7 @@
   
   PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
   PROGRAM_DEPENDENCIES = ../srclib/apr-util/libaprutil.la \
  -	../srclib/apr/$(LIBPRE)apr.a
  +	../srclib/apr/libapr.la
   
   include $(top_srcdir)/build/rules.mk
   
  
  
  

Mime
View raw message