cvs commit: apache-apr/apr/lib Makefile.in
coar99/06/10 09:55:59 Modified:apr configure.in apr/lib Makefile.in Log: Initial skeletal get-configure-to-run-on-FreeBSD patch. Revision ChangesPath 1.18 +9 -0 apache-apr/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- configure.in 1999/06/06 08:57:55 1.17 +++ configure.in 1999/06/10 16:55:57 1.18 @@ -12,6 +12,8 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_RANLIB +AC_CHECK_PROG(RM, rm, rm) +AC_CHECK_PROG(AR, ar, ar) AC_CHECK_PROGS(SH, /bin/sh sh) dnl Checks for libraries. @@ -71,6 +73,11 @@ OSDIR="unix" fi +if (test "$SYS_SW" = "FreeBSD"); then +PLATFORM="-DFreeBSD" +OSDIR="unix" +fi + if (test "$SYS_SW" = "OS/2"); then PLATFORM="-DOS2" OSDIR="os2" @@ -155,6 +162,8 @@ AC_SUBST(LDLIBS) AC_SUBST(OPTIM) AC_SUBST(RANLIB) +AC_SUBST(AR) +AC_SUBST(RM) AC_SUBST(PLATFORM) AC_SUBST(OSDIR) AC_SUBST(LIBPREFIX) 1.10 +2 -0 apache-apr/apr/lib/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.in 1999/06/06 08:57:57 1.9 +++ Makefile.in 1999/06/10 16:55:58 1.10 @@ -5,6 +5,8 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS)
cvs commit: apache-apr/apr/lib Makefile.in
rbb 99/05/10 13:11:40 Modified:apr Makefile.in configure.in apr/lib Makefile.in Log: You can now compile apr from the apr/directory. Next step is getting rest of apr using autoconf. Revision ChangesPath 1.3 +8 -3 apache-apr/apr/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-apr/apr/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 1999/04/10 04:28:00 1.2 +++ Makefile.in 1999/05/10 20:11:38 1.3 @@ -10,17 +10,18 @@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) - [EMAIL PROTECTED]@ # # Macros for supporting directories # INCDIR=./include -INCLUDES=-I$(INCDIR) +INCDIR1=../include +INCLUDES=-I$(INCDIR) -I$(INCDIR1) # # Macros for target determination # -MODULES=lib/libapr.a +MODULES=lib SUBDIRS=lib # @@ -35,6 +36,10 @@ # all: Makefile $(MODULES) subdirs @echo APR built. + +lib: + cd lib \ + make clean: $(RM) -f *.o *.a *.so 1.6 +1 -0 apache-apr/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configure.in 1999/04/14 11:06:24 1.5 +++ configure.in 1999/05/10 20:11:38 1.6 @@ -128,5 +128,6 @@ dnl Start building stuff from our information AC_SUBST(LDLIBS) AC_SUBST(OPTIM) +AC_SUBST(RANLIB) AC_SUBST(PLATFORM) AC_OUTPUT(Makefile lib/Makefile) 1.7 +2 -1 apache-apr/apr/lib/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.in 1999/05/10 15:29:39 1.6 +++ Makefile.in 1999/05/10 20:11:39 1.7 @@ -9,7 +9,8 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) INCDIR=../include -INCLUDES=-I../../include -I$(INCDIR) +INCDIR1=../../include +INCLUDES=-I$(INCDIR) -I$(INCDIR1) LIB=libapr.a
cvs commit: apache-apr/apr/lib Makefile.in
coar99/04/14 04:06:25 Modified:apr configure.in apr/lib Makefile.in Log: Correct usage of RANLIB to be a macro, and put OS/2 platform flag into the same format as the others. Revision ChangesPath 1.5 +1 -1 apache-apr/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- configure.in 1999/04/10 04:28:00 1.4 +++ configure.in 1999/04/14 11:06:24 1.5 @@ -61,7 +61,7 @@ fi if (test "$SYS_SW" = "OS/2"); then -CFLAGS="$CFLAGS -DOS2" +PLATFORM="-DOS2" fi dnl Checks for header files. 1.4 +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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.in 1999/04/10 04:28:02 1.3 +++ Makefile.in 1999/04/14 11:06:24 1.4 @@ -36,7 +36,7 @@ $(LIB): $(OBJS) $(RM) -f $@ $(AR) cr $@ $(OBJS) - @RANLIB@ $@ + $(RANLIB) $@ # # We really don't expect end users to use this rule. It works only with
cvs commit: apache-apr/apr/lib Makefile.in
bjh 99/04/09 21:28:03 Modified:apr configure.in Makefile.in apr/lib Makefile.in Added: apr/file_io/os2 Makefile Log: Some additions to the configure and build process for OS/2. Revision ChangesPath 1.4 +1 -0 apache-apr/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- configure.in 1999/04/09 05:37:00 1.3 +++ configure.in 1999/04/10 04:28:00 1.4 @@ -9,6 +9,7 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_RANLIB +AC_CHECK_PROGS(SH, /bin/sh sh) dnl Checks for libraries. 1.2 +2 -0 apache-apr/apr/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-apr/apr/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/03/25 20:12:21 1.1 +++ Makefile.in 1999/04/10 04:28:00 1.2 @@ -1,10 +1,12 @@ # # APR (Apache Portable Runtime) library Makefile. # [EMAIL PROTECTED]@ # # Macros for compilation commands # [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) 1.1 apache-apr/apr/file_io/os2/Makefile Index: Makefile === ## ## Apache Makefile, currently created manually. ## SRCDIR=.. EXTRA_CFLAGS=-g EXTRA_LDFLAGS= EXTRA_LIBS= EXTRA_INCLUDES= EXTRA_DEPS= OSDIR= INCDIR=../../../include INCLUDES0=-I $(INCDIR) SHELL=sh CC=gcc CPP=gcc -E TARGET= OPTIM= CFLAGS_SHLIB=-fpic -DSHARED_MODULE LD_SHLIB=ld LDFLAGS_SHLIB=-Bshareable LDFLAGS_SHLIB_EXPORT=-rdynamic CFLAGS1= -DOS2 -DUSE_HSREGEX INCLUDES1= LIBS_SHLIB= LDFLAGS1= MFLAGS_STATIC=--no-print-directory REGLIB=regex/libregex.a RANLIB=ar s LIBS1= -lm CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) LIBS=$(EXTRA_LIBS) $(LIBS1) INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) LIB=file.a OBJS= open.o readwrite.o filedup.o filestat.o maperrorcode.o seek.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $< all: $(HEADERS) $(LIB) $(LIB): $(OBJS) rm -f $@ ar cr $@ $(OBJS) $(RANLIB) $@ cp $@ ../ clean: rm -f *.o $(LIB) distclean: clean -rm -f Makefile # We really don't expect end users to use this rule. It works only with # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after # using it. depend: cp Makefile.tmpl Makefile.tmpl.bak \ && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \ && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \ && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \ -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \ > Makefile.tmpl \ && rm Makefile.new #Dependencies $(OBJS): Makefile # DO NOT REMOVE open.o: open.c filestat.c readwrite.o: readwrite.c filedup.o: filedup.c filestat.o: filestat.c seek.o: seek.c maperrorcode.o: maperrorcode.c 1.3 +1 -0 apache-apr/apr/lib/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 1999/03/25 20:12:26 1.2 +++ Makefile.in 1999/04/10 04:28:02 1.3 @@ -3,6 +3,7 @@ #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS)
cvs commit: apache-apr/apr/lib Makefile.in
coar99/03/25 12:12:29 Modified:apr .cvsignore configure.in apr/lib Makefile.in Added: apr Makefile.in Log: More along the development road.. which stretches a long way ahead.. Revision ChangesPath 1.2 +1 -1 apache-apr/apr/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-apr/apr/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/03/24 18:39:08 1.1 +++ .cvsignore1999/03/25 20:12:21 1.2 @@ -1,6 +1,6 @@ Makefile Makefile.tmpl configure +config.cache config.log config.status -config.cache 1.2 +34 -2 apache-apr/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- configure.in 1999/03/24 18:39:08 1.1 +++ configure.in 1999/03/25 20:12:21 1.2 @@ -10,6 +10,8 @@ AC_PROG_RANLIB dnl Checks for libraries. + +dnl Checks for operating system/platform identity SYS_HW=`(uname -m) 2>/dev/null` || SYS_HW="unknown" SYS_VER=`(uname -v) 2>/dev/null` || SYS_VER="unknown" SYS_SW=`(uname -s) 2>/dev/null` || SYS_SW="unknown" @@ -19,12 +21,41 @@ SYS_KV=`echo $SYS_REL | awk -F. '{printf "%s%s", $1, $2}'` LDLIBS="$LDLIBS -ldl" PLATFORM="-DLINUX=$SYS_KV" +case "$SYS_KV" in + 2*) + LDLIBS="$LDLIBS -lm" + ;; +esac fi -if test "$SYS_SW" = "AIX"; then +if (test "$SYS_SW" = "AIX"); then SYS_KV=`(oslevel) 2>/dev/null` || SYS_KV="0.0.0.0" SYS_KV=`echo $SYS_KV | awk -F. '{printf "%s%s%s", $1, $2, $3}'` +CFLAGS="$CFLAGS -U__STR__" PLATFORM="-DAIX=$SYS_KV" +case "$SYS_KV" in + [12]*) + AC_DEFINE(USEBCOPY) + ;; + 3*) + AC_DEFINE(NEED_RLIM_T) + ;; + 41*) + AC_DEFINE(NEED_RLIM_T) + ;; + 42*) + LDLIBS="$LDLIBS -lm" + ;; + 432) + LDLIBS="$LDLIBS -lm" + ;; + 43*) + LDLIBS="$LDLIBS -lm" + ;; + *) + LDLIBS="$LDLIBS -lm" + ;; +esac fi dnl Checks for header files. @@ -88,7 +119,8 @@ dnl Checks for library functions. +dnl Start building stuff from our information AC_SUBST(LDLIBS) AC_SUBST(OPTIM) AC_SUBST(PLATFORM) -AC_OUTPUT(lib/Makefile) +AC_OUTPUT(Makefile lib/Makefile) 1.1 apache-apr/apr/Makefile.in Index: Makefile.in === # # APR (Apache Portable Runtime) library Makefile. # # # Macros for compilation commands # [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) # # Macros for supporting directories # INCDIR=./include INCLUDES=-I$(INCDIR) # # Macros for target determination # MODULES=lib/libapr.a SUBDIRS=lib # # Rules for turning inputs into outputs # .c.o: $(CC) $(CFLAGS) -c $(INCLUDES) $< # # Rules for building specific targets, starting with 'all' for # building the entire package. # all: Makefile $(MODULES) subdirs @echo APR built. clean: $(RM) -f *.o *.a *.so distclean: clean -$(RM) -f Makefile subdirs: @for i in $(SUBDIRS); do \ echo "===> $$i"; \ ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' \ CC='$(CC)' AUX_CFLAGS='$(AUX_CFLAGS)' RANLIB='$(RANLIB)' ) \ || exit 1; \ echo "<== $$i"; \ done; # DO NOT REMOVE 1.2 +2 -3 apache-apr/apr/lib/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/03/24 18:39:11 1.1 +++ Makefile.in 1999/03/25 20:12:26 1.2 @@ -11,9 +11,6 @@ LIB=libapr.a -#OBJS=ap_execve.o ap_cpystrn.o ap_signal.o \ -# ap_slack.o ap_snprintf.o ap_fnmatch.o ap_md5c.o - OBJS=apr_cpystrn.o \ apr_fnmatch.o \ apr_execve.o \ @@ -40,9 +37,11 @@ $(AR) cr $@ $(OBJS) @RANLIB@ $@ +# # We really don't expect end users to use this rule. It works only with # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after # using it. +# depend: cp Makefile.in Makefile.in.bak \ && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
cvs commit: apache-apr/apr/lib Makefile.in apr_cpystrn.c apr_execve.c apr_fnmatch.c apr_md5.c apr_signal.c apr_slack.c apr_snprintf.c
coar99/03/24 10:39:13 Added: apr .cvsignore configure.in apr/include .cvsignore apr_config.h.in apr_fnmatch.h apr_lib.h apr_md5.h apr/lib Makefile.in apr_cpystrn.c apr_execve.c apr_fnmatch.c apr_md5.c apr_signal.c apr_slack.c apr_snprintf.c Log: First barely-partial cut at starting libapr (based on libap), by someone learning autoconf as he goes along.. Revision ChangesPath 1.1 apache-apr/apr/.cvsignore Index: .cvsignore === Makefile Makefile.tmpl configure config.log config.status config.cache 1.1 apache-apr/apr/configure.in Index: configure.in === dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) AC_CONFIG_HEADER(include/apr_config.h) AC_ARG_WITH(optim,[ --with-optim="FLAGS" compiler optimisation flags], [OPTIM="$withval"]) dnl Checks for programs. AC_PROG_RANLIB dnl Checks for libraries. SYS_HW=`(uname -m) 2>/dev/null` || SYS_HW="unknown" SYS_VER=`(uname -v) 2>/dev/null` || SYS_VER="unknown" SYS_SW=`(uname -s) 2>/dev/null` || SYS_SW="unknown" SYS_REL=`(uname -r) 2>/dev/null` || SYS_REL="unknown" if (echo "$SYS_SW" | grep -qi 'Linux'); then SYS_KV=`echo $SYS_REL | awk -F. '{printf "%s%s", $1, $2}'` LDLIBS="$LDLIBS -ldl" PLATFORM="-DLINUX=$SYS_KV" fi if test "$SYS_SW" = "AIX"; then SYS_KV=`(oslevel) 2>/dev/null` || SYS_KV="0.0.0.0" SYS_KV=`echo $SYS_KV | awk -F. '{printf "%s%s%s", $1, $2, $3}'` PLATFORM="-DAIX=$SYS_KV" fi dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS(crypt.h) AC_CHECK_HEADERS(ctype.h) AC_CHECK_HEADERS(dir.h) AC_CHECK_HEADERS(dirent.h) AC_CHECK_HEADERS(errno.h) AC_CHECK_HEADERS(net/errno.h) AC_CHECK_HEADERS(fcntl.h) AC_CHECK_HEADERS(features.h) AC_CHECK_HEADERS(grp.h) AC_CHECK_HEADERS(io.h) AC_CHECK_HEADERS(limits.h) AC_CHECK_HEADERS(malloc.h) AC_CHECK_HEADERS(math.h) AC_CHECK_HEADERS(memory.h) AC_CHECK_HEADERS(netdb.h) AC_CHECK_HEADERS(osreldate.h) AC_CHECK_HEADERS(process.h) AC_CHECK_HEADERS(pwd.h) AC_CHECK_HEADERS(setjmp.h) AC_CHECK_HEADERS(signal.h) AC_CHECK_HEADERS(stdarg.h) AC_CHECK_HEADERS(stddef.h) AC_CHECK_HEADERS(stdio.h) AC_CHECK_HEADERS(stdlib.h) AC_CHECK_HEADERS(string.h) AC_CHECK_HEADERS(sysapi.h) AC_CHECK_HEADERS(sysgtime.h) AC_CHECK_HEADERS(time.h) AC_CHECK_HEADERS(sys/time.h) AC_CHECK_HEADERS(sys/times.h) AC_CHECK_HEADERS(tpfeq.h) AC_CHECK_HEADERS(tpfio.h) AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(unix.h) AC_CHECK_HEADERS(winsock.h) AC_CHECK_HEADERS(arpa/inet.h) AC_CHECK_HEADERS(netinet/in.h) AC_CHECK_HEADERS(sys/file.h) AC_CHECK_HEADERS(sys/ioctl.h) AC_CHECK_HEADERS(sys/mman.h) AC_CHECK_HEADERS(sys/param.h) AC_CHECK_HEADERS(sys/resource.h) AC_CHECK_HEADERS(sys/select.h) AC_CHECK_HEADERS(sys/socket.h) AC_CHECK_HEADERS(sys/stat.h) AC_CHECK_HEADERS(sys/types.h) AC_CHECK_HEADERS(sys/wait.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_SIZE_T AC_FUNC_MMAP AC_FUNC_SETPGRP dnl Checks for library functions. AC_SUBST(LDLIBS) AC_SUBST(OPTIM) AC_SUBST(PLATFORM) AC_OUTPUT(lib/Makefile) 1.1 apache-apr/apr/include/.cvsignore <> 1.1 apache-apr/apr/include/apr_config.h.in Index: apr_config.h.in === /* * Start.. */ #ifndef APR_CONFIG_H #define APR_CONFIG_H /* * Just in case someone's building with a C++ compiler, isolate our * work appropriately. */ #ifdef __cplusplus extern "C" { #endif /* * List of header files which exist for this platform. */ #undef HAVE_CRYPT_H #undef HAVE_CTYPE_H #undef HAVE_DIR_H #undef HAVE_DIRENT_H #undef HAVE_ERRNO_H #undef HAVE_NET_ERRNO_H #undef HAVE_FCNTL_H #undef HAVE_FEATURES_H #undef HAVE_GRP_Ho #undef HAVE_IO_H #undef HAVE_LIMITS_H #undef HAVE_MALLOC_H #undef HAVE_MATH_H #undef HAVE_MEMORY_H #undef HAVE_NETDB_H #undef HAVE_OSRELDATE_H #undef HAVE_PROCESS_H #undef HAVE_PWD_H #undef HAVE_SETJMP_H #undef HAVE_SIGNAL_H #undef HAVE_STDARG_H #undef HAVE_STDDEF_H #undef HAVE_STDIO_H #undef HAVE_STDLIB_H #undef HAVE_STRING_H #undef HAVE_SYSAPI_H #undef HAVE_SYSGTIME_H #undef HAVE_TIME_H #undef HAVE_SYS_TIME_H #undef HAVE_SYS_TIMES_H #undef HAVE_TPFEQ_H #undef HAVE_TPFIO_H #undef HAVE_UNISTD_H #undef HAVE_UNIX_H #undef HAVE_WINSOCK_H #undef HAVE_ARPA_INET_H #undef HAVE_NETINET_IN_H #undef HAVE_SYS_FILE_H #undef HAVE_SYS_IOCTL_H #