httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/src CHANGES Configure
Date Sat, 18 Jul 1998 10:51:55 GMT
rse         98/07/18 03:51:54

  Modified:    src      CHANGES Configure
  Log:
  Fix broken RANLIB handling in src/Configure (the entry from
  src/Configuration.tmpl was ignored) and additionally force RANLIB
  to /bin/true under HP/UX where ranlib exists but is deprecated.
  
  PR: 2627
  
  Revision  Changes    Path
  1.968     +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.967
  retrieving revision 1.968
  diff -u -r1.967 -r1.968
  --- CHANGES	1998/07/16 21:50:25	1.967
  +++ CHANGES	1998/07/18 10:51:51	1.968
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.1
   
  +  *) Fix broken RANLIB handling in src/Configure (the entry from
  +     src/Configuration.tmpl was ignored) and additionally force RANLIB to
  +     /bin/true under HP/UX where ranlib exists but is deprecated.
  +     [Ralf S. Engelschall] PR#2627
  +     
     *) 'apachectl status' failed on some systems.
        [Steve VanDevender <stevev@darkwing.uoregon.edu>, Lars Eilebrecht] PR#2613
   
  
  
  
  1.279     +19 -5     apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.278
  retrieving revision 1.279
  diff -u -r1.278 -r1.279
  --- Configure	1998/07/17 19:08:26	1.278
  +++ Configure	1998/07/18 10:51:52	1.279
  @@ -258,11 +258,6 @@
   AP_PRINTPATH=PrintPath
   export AP_PRINTPATH
   CAT="cat"
  -if ./helpers/$AP_PRINTPATH -s ranlib; then
  -    RANLIB="ranlib"
  -else
  -    RANLIB="true"
  -fi
   
   ####################################################################
   ## Now we determine the OS/Platform automagically, thanks to
  @@ -363,12 +358,14 @@
       *-hp-hpux11.*)
   	OS='HP-UX 11'
   	CFLAGS="$CFLAGS -DHPUX11"
  +	RANLIB="/bin/true"
   	LIBS="$LIBS -lm -lpthread"
   	DEF_WANTHSREGEX=yes
   	;;
       *-hp-hpux10.*)
   	OS='HP-UX 10'
   	CFLAGS="$CFLAGS -DHPUX10"
  +	RANLIB="/bin/true"
    	case "$PLAT" in
    	  *-hp-hpux10.01)
   	       # We know this is a problem in 10.01.
  @@ -381,6 +378,7 @@
       *-hp-hpux*)
   	OS='HP-UX'
   	CFLAGS="$CFLAGS -DHPUX"
  +	RANLIB="/bin/true"
   	DEF_WANTHSREGEX=yes
   	LIBS="$LIBS -lm"
   	;;
  @@ -797,6 +795,7 @@
   ## Look for OPTIM and save for later
   ##
   TOPTIM=`egrep '^OPTIM=' Makefile.config | tail -1 | awk -F= '{print $2}'`
  +TRANLIB=`egrep '^RANLIB=' Makefile.config | tail -1 | awk -F= '{print $2}'`
   
   ####################################################################
   ## Check for user provided flags for shared object support
  @@ -1141,6 +1140,21 @@
   ##
   if [ "x$TOPTIM" = "x" ]; then
       echo "OPTIM=$OPTIM" >> Makefile.config
  +fi
  +
  +####################################################################
  +## OK, now handle RANLIB
  +##
  +if [ ".$RANLIB" = . ]; then
  +    if [ ".$TRANLIB" != . ]; then
  +        RANLIB=$TRANLIB
  +    else
  +        if ./helpers/$AP_PRINTPATH -s ranlib; then
  +            RANLIB="ranlib"
  +        else
  +            RANLIB="true"
  +        fi
  +    fi
   fi
   
   ####################################################################
  
  
  

Mime
View raw message