httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@hyperreal.org
Subject cvs commit: apache-apr/apr/test Makefile.in
Date Sun, 06 Jun 1999 08:57:59 GMT
bjh         99/06/06 01:57:58

  Modified:    apr      configure.in
               apr/include apr_config.h.in
               apr/lib  Makefile.in
               apr/test Makefile.in
  Log:
  Get autoconf to take care of some peculiarities of the OS/2 emx environment.
  - executables have .exe extension
  - libraries don't have a 'lib' prefix.
  - has stricmp instead of strcasecmp
  
  Revision  Changes    Path
  1.17      +8 -0      apache-apr/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/configure.in,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- configure.in	1999/05/27 19:02:19	1.16
  +++ configure.in	1999/06/06 08:57:55	1.17
  @@ -6,6 +6,9 @@
   AC_ARG_WITH(optim,[  --with-optim="FLAGS"      compiler optimisation flags],
   	[OPTIM="$withval"])
   
  +# Most platforms use a prefix of 'lib' on their library files.
  +LIBPREFIX='lib'
  +
   dnl Checks for programs.
   AC_PROG_CC
   AC_PROG_RANLIB
  @@ -71,6 +74,8 @@
   if (test "$SYS_SW" = "OS/2"); then
       PLATFORM="-DOS2"
       OSDIR="os2"
  +    LDLIBS="$LDLIBS -lsocket"
  +    LIBPREFIX=''
   fi
   
   if (test "$SYS_SW" = "BeOS"); then
  @@ -144,6 +149,7 @@
   AC_FUNC_SETPGRP
   
   dnl Checks for library functions.
  +AC_CHECK_FUNCS(strcasecmp stricmp)
   
   dnl Start building stuff from our information
   AC_SUBST(LDLIBS)
  @@ -151,6 +157,8 @@
   AC_SUBST(RANLIB)
   AC_SUBST(PLATFORM)
   AC_SUBST(OSDIR)
  +AC_SUBST(LIBPREFIX)
  +AC_SUBST(EXEEXT)
   AC_OUTPUT(Makefile lib/Makefile file_io/$OSDIR/Makefile 
             network_io/$OSDIR/Makefile threadproc/$OSDIR/Makefile 
             locks/$OSDIR/Makefile misc/$OSDIR/Makefile 
  
  
  
  1.6       +6 -0      apache-apr/apr/include/apr_config.h.in
  
  Index: apr_config.h.in
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/include/apr_config.h.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_config.h.in	1999/05/26 20:22:32	1.5
  +++ apr_config.h.in	1999/06/06 08:57:57	1.6
  @@ -71,6 +71,8 @@
    * they're compatible.
    */
   #undef HAVE_MMAP
  +#undef HAVE_STRCASECMP
  +#undef HAVE_STRICMP
   
   /*
    * Known problems with system header files that we can fix.
  @@ -484,6 +486,10 @@
    } while (0)
   #else
   #define RAISE_SIGSTOP(x)
  +#endif
  +
  +#if !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP)
  +#define strcasecmp stricmp
   #endif
   
   /*
  
  
  
  1.9       +1 -1      apache-apr/apr/lib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	1999/06/02 18:44:37	1.8
  +++ Makefile.in	1999/06/06 08:57:57	1.9
  @@ -13,7 +13,7 @@
   INCDIR2=../misc/@OSDIR@
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2)
   
  -LIB=libapr.a
  +LIB=@LIBPREFIX@apr.a
   
   OBJS=apr_cpystrn.o \
   	apr_fnmatch.o \
  
  
  
  1.9       +21 -21    apache-apr/apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	1999/05/27 19:02:37	1.8
  +++ Makefile.in	1999/06/06 08:57:58	1.9
  @@ -7,18 +7,18 @@
   CC=@CC@
   RANLIB=@RANLIB@
   CFLAGS=@PLATFORM@ @CFLAGS@ @OPTIM@ 
  -LDLIBS=@LDLIBS@ -L../network_io -lnetwork -L../threadproc -lthreadproc -L../file_io -lfile
-L../misc -lmisc -L../lib -lapr -L../time -ltime -L../locks -llock
  +LDLIBS=-L../network_io -lnetwork -L../threadproc -lthreadproc -L../file_io -lfile -L../misc
-lmisc -L../lib -lapr -L../time -ltime -L../locks -llock @LDLIBS@ 
   LDFLAGS=@LDFLAGS@ $(LDLIBS)
   INCDIR=../include
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) 
   
  -TARGETS= testfile \
  -	testproc \
  -	testsock \
  -	testthread \
  -	ab \
  -	testtime
  +TARGETS= testfile@EXEEXT@ \
  +	testproc@EXEEXT@ \
  +	testsock@EXEEXT@ \
  +	testthread@EXEEXT@ \
  +	ab@EXEEXT@ \
  +	testtime@EXEEXT@
   
   OBJS= testfile.o \
   	testproc.o \
  @@ -32,25 +32,25 @@
   
   all: $(TARGETS) 
   
  -testfile: testfile.o
  -	$(CC) $(CFLAGS) testfile.o -o testfile $(LDFLAGS) 
  +testfile@EXEEXT@: testfile.o
  +	$(CC) $(CFLAGS) testfile.o -o testfile@EXEEXT@ $(LDFLAGS) 
   
  -ab: ab_apr.o
  -	$(CC) $(CFLAGS) ab_apr.o -o ab $(LDFLAGS)
  +ab@EXEEXT@: ab_apr.o
  +	$(CC) $(CFLAGS) ab_apr.o -o ab@EXEEXT@ $(LDFLAGS)
   
  -testproc: testproc.o
  -	$(CC) $(CFLAGS) testproc.o -o testproc $(LDFLAGS)
  +testproc@EXEEXT@: testproc.o
  +	$(CC) $(CFLAGS) testproc.o -o testproc@EXEEXT@ $(LDFLAGS)
   
  -testthread: testthread.o
  -	$(CC) $(CFLAGS) testthread.o -o testthread $(LDFLAGS)
  +testthread@EXEEXT@: testthread.o
  +	$(CC) $(CFLAGS) testthread.o -o testthread@EXEEXT@ $(LDFLAGS)
   
  -testsock: testsock.o client.o server.o 
  -	$(CC) $(CFLAGS) testsock.o -o testsock  $(LDFLAGS)
  -	$(CC) $(CFLAGS) server.o -o server $(LDFLAGS) 
  -	$(CC) $(CFLAGS) client.o -o client $(LDFLAGS)
  +testsock@EXEEXT@: testsock.o client.o server.o 
  +	$(CC) $(CFLAGS) testsock.o -o testsock@EXEEXT@  $(LDFLAGS)
  +	$(CC) $(CFLAGS) server.o -o server@EXEEXT@ $(LDFLAGS) 
  +	$(CC) $(CFLAGS) client.o -o client@EXEEXT@ $(LDFLAGS)
   
  -testtime: testtime.o
  -	$(CC) $(CFLAGS) testtime.o -o testtime $(LDFLAGS)
  +testtime@EXEEXT@: testtime.o
  +	$(CC) $(CFLAGS) testtime.o -o testtime@EXEEXT@ $(LDFLAGS)
   
   clean:
   	$(RM) -f *.o *.a *.so $(TARGETS)
  
  
  

Mime
View raw message