httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.com>
Subject cvs commit: apache/src/helpers PrintPath
Date Tue, 21 Jan 1997 14:28:48 GMT
jim         97/01/21 06:28:47

  Modified:    src       Configure
               src/helpers  PrintPath
  Log:
  Make PrintPath self-contained by placing test for -x
  inside of it. Fallback is using -r if -x doesn't exist
  
  Revision  Changes    Path
  1.72      +0 -4      apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -C3 -r1.71 -r1.72
  *** Configure	1997/01/19 17:43:27	1.71
  --- Configure	1997/01/21 14:28:44	1.72
  ***************
  *** 17,23 ****
    file=Configuration
    tmpfile=htconf.$$
    makefile_tmpl=Makefile.tmpl
  - CONF_TEST_EXECUTABLE=-x
    
    while [ "x$1" != "x" ]; do
      if [ "x$1" = "x-file" ] ; then
  --- 17,22 ----
  ***************
  *** 359,365 ****
    	OS='ULTRIX'
    	CFLAGS="-DULTRIX"
    	DEF_WANTHSREGEX=yes
  - 	CONF_TEST_EXECUTABLE=-r
    	;;
        *powerpc-tenon-machten*)
        	OS='MachTen'
  --- 358,363 ----
  ***************
  *** 395,402 ****
    	exit 1
    	;;
    esac
  - 
  - export CONF_TEST_EXECUTABLE
    
    #
    # See if we need to override WANTHSREGEX
  --- 393,398 ----
  
  
  
  1.7       +24 -1     apache/src/helpers/PrintPath
  
  Index: PrintPath
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/PrintPath,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** PrintPath	1997/01/19 17:43:31	1.6
  --- PrintPath	1997/01/21 14:28:46	1.7
  ***************
  *** 3,8 ****
  --- 3,30 ----
    #  will print out the full pathname unless
    #  called with the '-s' option
    #
  + # We do some funny stuff to check to see
  + # if test/[] knows about -x
  + #
  + trap 'rm -f $testfile; exit' 0 1 2 3 15
  + testfile="pp.t.$$"
  + 
  + cat > $testfile <<ENDTEST
  + #!/bin/sh
  + if [ -x /dev/null ]
  + then
  +  :
  + fi
  + echo "YES"
  + ENDTEST
  + 
  + havex=`/bin/sh $testfile 2>/dev/null`
  + 
  + if [ "x$havex" = "xYES" ]; then
  +     test_exec_flag="-x"
  + else
  +     test_exec_flag="-r"
  + fi
    
    if [ "x$1" = "x-s" ]; then
        shift
  ***************
  *** 16,22 ****
          s/:$/:./
          s/:/ /g' `
    do
  !     if [ $CONF_TEST_EXECUTABLE $path/$1 ] && [ ! -d $path/$1 ]; then
            if [ "$echo" = "yes" ]; then
    	    echo $path/$1
    	fi
  --- 38,44 ----
          s/:$/:./
          s/:/ /g' `
    do
  !     if [ $test_exec_flag $path/$1 ] && [ ! -d $path/$1 ]; then
            if [ "$echo" = "yes" ]; then
    	    echo $path/$1
    	fi
  ***************
  *** 24,26 ****
  --- 46,49 ----
        fi
    done
    exit 1
  + 
  
  
  

Mime
View raw message