httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/pcre Makefile.in configure.in
Date Tue, 16 May 2000 10:57:30 GMT
bjh         00/05/16 03:57:30

  Modified:    src      Makefile.in
               src/lib/pcre Makefile.in configure.in
  Log:
  Fix PCRE build on OS/2. This includes taking libtool out of the picture,
  making static build the default.
  
  Revision  Changes    Path
  1.21      +2 -2      apache-2.0/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Makefile.in	2000/05/11 21:56:51	1.20
  +++ Makefile.in	2000/05/16 10:57:27	1.21
  @@ -11,8 +11,8 @@
     os/$(OS_DIR)/libos.la \
     ap/libap.la \
     lib/apr/$(LIBPRE)apr.a \
  -  lib/pcre/libpcreposix.la \
  -  lib/pcre/libpcre.la
  +  lib/pcre/libpcreposix.a \
  +  lib/pcre/libpcre.a
   
   PROGRAMS        = $(PROGRAM_NAME)
   targets         = $(PROGRAMS)
  
  
  
  1.2       +2 -1      apache-2.0/src/lib/pcre/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/pcre/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2000/05/05 23:28:21	1.1
  +++ Makefile.in	2000/05/16 10:57:28	1.2
  @@ -24,6 +24,7 @@
   # The pcretest program, as it is a test program, does not get installed
   # anywhere.
   
  +SHELL=@SHELL@
   prefix = @prefix@
   exec_prefix = @exec_prefix@
   
  @@ -180,7 +181,7 @@
   # chartables.c shouldn't change, and if people have edited the tables by hand,
   # you don't want to throw them away.
   
  -clean:;         -rm -rf *.o *.lo *.a *.la .libs pcretest pgrep testtry
  +clean:;         -rm -rf *.o *.lo *.a *.la .libs pcretest pgrep testtry *.exe
   
   # But "make distclean" should get back to a virgin distribution
   
  
  
  
  1.2       +14 -6     apache-2.0/src/lib/pcre/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/pcre/configure.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configure.in	2000/05/05 23:28:21	1.1
  +++ configure.in	2000/05/16 10:57:29	1.2
  @@ -48,15 +48,23 @@
   
   dnl Handle --enable-shared-libraries
   
  -LIBTOOL=libtool
  -LIBSUFFIX=la
  +LIBTOOL=
  +LIBSUFFIX=a
   AC_ARG_ENABLE(shared,
  -[  --disable-shared        build PCRE as a static library],
  -if test "$enableval" = "no"; then
  -  LIBTOOL=
  -  LIBSUFFIX=a
  +[  --enable-shared        build PCRE as a shared library],
  +if test "$enableval" = "yes"; then
  +  LIBTOOL=libtool
  +  LIBSUFFIX=la
   fi
   )
  +
  +PLATFORM=`uname -s`
  +
  +case "$PLATFORM" in
  +*OS/2*)
  +  CFLAGS="$CFLAGS -Zexe"
  +  ;;
  +esac
   
   dnl "Export" these variables
   
  
  
  

Mime
View raw message