coar 99/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 Changes Path
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
--- .cvsignore 1999/03/24 18:39:08 1.1
+++ .cvsignore 1999/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 \
