httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/main Makefile.in
Date Thu, 05 Oct 2000 05:42:07 GMT
rbb         00/10/04 22:42:06

  Modified:    src      CHANGES acinclude.m4 configure.in
               src/build rules.mk
               src/lib/apr Makefile.in aclocal.m4 configure.in
               src/lib/apr/dso/unix Makefile.in
               src/lib/apr/shmem/unix Makefile.in
               src/lib/apr/shmem/unix/mm configure.in
               src/main Makefile.in
  Log:
  Multiple build and configuration fixes
  
  Build process:
  
    -add datadir and localstatedir substitutions
    -fix layout name
    -fix logfilename misspelling
    -fix evaluation of installation dir variables and
    -replace $foobar by $(foobar) to be usefull in the makefile
  
  Cross compile:
  
    -add rules for cross-compiling in rules.mk. Okay, rule to check for
     $CC_FOR_BUILD is still missing
    -use CHECK_TOOL instead of CHECK_PROG for ranlib
    -add missing "AR=@AR@" to severaly Makefile.in's
    -cache result for "struct rlimit"
    -compile all helper programs with native and cross compiler
     and use the native version to generate header file
  
  PR:	6384
  Submitted by:	"Rüdiger" Kuhlmann <Tadu@gmx.de>
  Reviewed by:	Ryan Bloom
  
  Revision  Changes    Path
  1.248     +19 -0     apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.247
  retrieving revision 1.248
  diff -u -r1.247 -r1.248
  --- CHANGES	2000/10/05 04:41:45	1.247
  +++ CHANGES	2000/10/05 05:42:03	1.248
  @@ -1,4 +1,23 @@
   Changes with Apache 2.0a7
  +  *) Multiple build and configuration fixes
  +    Build process:
  +
  +      -add datadir and localstatedir substitutions
  +      -fix layout name
  +      -fix logfilename misspelling
  +      -fix evaluation of installation dir variables and
  +      -replace $foobar by $(foobar) to be usefull in the makefile
  +    
  +    Cross compile:
  +    
  +      -add rules for cross-compiling in rules.mk. Okay, rule to check for
  +       $CC_FOR_BUILD is still missing
  +      -use CHECK_TOOL instead of CHECK_PROG for ranlib
  +      -add missing "AR=@AR@" to severaly Makefile.in's
  +      -cache result for "struct rlimit"
  +      -compile all helper programs with native and cross compiler
  +       and use the native version to generate header file
  +     ["Rüdiger" Kuhlmann <Tadu@gmx.de>]
   
     *) Prepare our autoconf setup for autoconf 2.14a and for cross-
        compiling.
  
  
  
  1.48      +6 -3      apache-2.0/src/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- acinclude.m4	2000/10/05 04:41:45	1.47
  +++ acinclude.m4	2000/10/05 05:42:03	1.48
  @@ -57,6 +57,8 @@
     APACHE_SUBST(cgidir)
     APACHE_SUBST(logdir)
     APACHE_SUBST(exec_prefix)
  +  APACHE_SUBST(datadir)
  +  APACHE_SUBST(localstatedir)
     APACHE_SUBST(libexecdir)
     APACHE_SUBST(htdocsdir)
     APACHE_SUBST(includedir)
  @@ -338,13 +340,12 @@
         -e "s/:[ 	]*/=\'/g" \
         -e "s/[ 	]*$/'/g" \
         $1 > $pldconf
  -  changequote([,])
     layout_name=$2
     . $pldconf
     rm $pldconf
     for var in prefix exec_prefix bindir sbindir libexecdir mandir \
                sysconfdir datadir iconsdir htdocsdir cgidir includedir \
  -             localstatedir runtimedir logfiledir proxycachedir; do
  +             localstatedir runtimedir logdir proxycachedir; do
       eval "val=\"\$$var\""
       case $val in
         *+)
  @@ -357,6 +358,7 @@
           ;;
       esac
       val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
  +    val=`echo $val | sed -e 's:$\([a-z_]*\):$(\1):g'`
       if test "$autosuffix" = "yes"; then
         if echo $val | grep apache >/dev/null; then
           addtarget=no
  @@ -367,8 +369,9 @@
           val="$val/apache"
         fi
       fi
  -    eval "$var=\"$val\""
  +    eval "$var='$val'"
     done
  +  changequote([,])
   ])dnl
   dnl
   dnl APACHE_ENABLE_LAYOUT
  
  
  
  1.80      +1 -1      apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- configure.in	2000/10/05 04:41:45	1.79
  +++ configure.in	2000/10/05 05:42:03	1.80
  @@ -43,7 +43,7 @@
   AC_PROG_CPP
   AC_PROG_INSTALL
   AC_PROG_LN_S
  -dnl AC_PROG_RANLIB
  +AC_CHECK_TOOL(RANLIB, ranlib, true)
   dnl AC_PATH_PROG(PERL_PATH, perl)
   
   REENTRANCY_FLAGS
  
  
  
  1.26      +10 -0     apache-2.0/src/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/rules.mk,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- rules.mk	2000/08/19 00:34:38	1.25
  +++ rules.mk	2000/10/05 05:42:04	1.26
  @@ -73,6 +73,16 @@
   LINK    = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@
   SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@
   
  +# Cross compile commands
  +
  +ifeq (,$(CC_FOR_BUILD))
  +CC_FOR_BUILD  = $(CC)
  +endif
  +
  +BUILD_COMPILE    = $(CC_FOR_BUILD) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
  +BUILD_LT_COMPILE = $(BUILD_COMPILE) -c $< -o build-$(@:.lo=.o)
  +BUILD_LINK       = $(BUILD_COMPILE) $(LTFLAGS) $(LDFLAGS) -o build-$@
  +
   # Helper programs
   
   SH_LIBTOOL = $(SHELL) $(top_builddir)/shlibtool --silent
  
  
  
  1.27      +1 -0      apache-2.0/src/lib/apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Makefile.in	2000/09/13 20:13:26	1.26
  +++ Makefile.in	2000/10/05 05:42:04	1.27
  @@ -13,6 +13,7 @@
   CFLAGS=@CFLAGS@ @OPTIM@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
  +AR=@AR@
   RANLIB=@RANLIB@
   #
   # Macros for supporting directories
  
  
  
  1.28      +1 -1      apache-2.0/src/lib/apr/aclocal.m4
  
  Index: aclocal.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- aclocal.m4	2000/09/29 19:32:20	1.27
  +++ aclocal.m4	2000/10/05 05:42:04	1.28
  @@ -261,7 +261,7 @@
   dnl the way we might want it to.
   
   AC_DEFUN(AC_PROG_RANLIB_NC,
  -[AC_CHECK_PROG(RANLIB, ranlib, ranlib, true)])
  +[AC_CHECK_TOOL(RANLIB, ranlib, true)])
   
   AC_DEFUN(APR_EBCDIC,[
     AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[
  
  
  
  1.155     +6 -8      apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- configure.in	2000/10/05 04:41:46	1.154
  +++ configure.in	2000/10/05 05:42:04	1.155
  @@ -551,7 +551,7 @@
     
   AC_SUBST(oc) 
   
  -AC_MSG_CHECKING(struct rlimit)
  +AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[
   AC_TRY_RUN([
   #include <sys/types.h>
   #include <sys/time.h>
  @@ -563,13 +563,11 @@
       limit.rlim_max = 0;
       exit(0);
   }], [
  -    struct_rlimit="1"
  -    AC_MSG_RESULT(yes) ], [
  -    struct_rlimit="0"
  -    AC_MSG_RESULT(no) ], [
  -    struct_rlimit="0"
  -    AC_MSG_RESULT(no) ] )
  -
  +    ac_cv_struct_rlimit=yes ], [
  +    ac_cv_struct_rlimit=no ], [
  +    ac_cv_struct_rlimit=no ] ) ] )
  +struct_rlimit=0
  +test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1
   AC_SUBST(struct_rlimit)
   
   dnl #----------------------------- Checking for Locking Characteristics 
  
  
  
  1.11      +1 -0      apache-2.0/src/lib/apr/dso/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	2000/07/13 16:23:35	1.10
  +++ Makefile.in	2000/10/05 05:42:05	1.11
  @@ -5,6 +5,7 @@
   
   RM=@RM@
   CC=@CC@
  +AR=@AR@
   RANLIB=@RANLIB@
   CFLAGS=@CFLAGS@ @OPTIM@
   LIBS=@LIBS@
  
  
  
  1.12      +1 -0      apache-2.0/src/lib/apr/shmem/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/Makefile.in,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.in	2000/04/30 17:58:31	1.11
  +++ Makefile.in	2000/10/05 05:42:05	1.12
  @@ -5,6 +5,7 @@
   
   RM=@RM@
   CC=@CC@
  +AR=@AR@
   RANLIB=@RANLIB@
   CFLAGS=@CFLAGS@ @OPTIM@
   LIBS=@LIBS@
  
  
  
  1.6       +2 -0      apache-2.0/src/lib/apr/shmem/unix/mm/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/configure.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- configure.in	2000/10/05 04:41:46	1.5
  +++ configure.in	2000/10/05 05:42:06	1.6
  @@ -10,6 +10,7 @@
   AC_REVISION($1.0$)dnl
   
   dnl #   autoconf initialization
  +AC_CONFIG_AUX_DIR(../../../helpers)
   AC_INIT(README)
   AC_CONFIG_HEADER(mm_conf.h)
   AC_PREFIX_DEFAULT(/usr/local)
  @@ -50,6 +51,7 @@
   AC_CONFIGURE_PART(Build Tools)
   AC_PROG_CC
   AC_PROG_CPP
  +#AC_CHECK_TOOL(RANLIB, ranlib, true)
   AC_CHECK_DEBUGGING
   AC_SET_MAKE
   AC_PROG_LIBTOOL
  
  
  
  1.19      +8 -2      apache-2.0/src/main/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/Makefile.in,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Makefile.in	2000/08/23 00:01:52	1.18
  +++ Makefile.in	2000/10/05 05:42:06	1.19
  @@ -15,17 +15,23 @@
   
   gen_uri_delims_OBJECTS = gen_uri_delims.lo
   gen_uri_delims: $(gen_uri_delims_OBJECTS)
  +	$(BUILD_LINK) $(EXTRA_LDFLAGS) $(foreach f,$(gen_uri_delims_OBJECTS),build-$(f:.lo=.o))
$(EXTRA_LIBS)
   	$(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS) $(EXTRA_LIBS)
   
   gen_test_char_OBJECTS = gen_test_char.lo util_debug.lo
   gen_test_char: $(gen_test_char_OBJECTS)
  +	$(BUILD_LINK) $(EXTRA_LDFLAGS) $(foreach f,$(gen_test_char_OBJECTS),build-$(f:.lo=.o))
$(EXTRA_LIBS)
   	$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
   
  +$(gen_uri_delims_OBJECTS) $(gen_test_char_OBJECTS): %.lo: %.c
  +	$(BUILD_LT_COMPILE)
  +	$(LT_COMPILE)
  +
   uri_delims.h: gen_uri_delims
  -	./gen_uri_delims > uri_delims.h
  +	./build-gen_uri_delims > uri_delims.h
   
   test_char.h: gen_test_char
  -	./gen_test_char > test_char.h
  +	./build-gen_test_char > test_char.h
   
   util_uri.lo: uri_delims.h
   util.lo: test_char.h
  
  
  

Mime
View raw message