Received: (from majordom@localhost)
	by hyperreal.org (8.8.5/8.8.5) id SAA05165;
	Sun, 20 Jul 1997 18:21:38 -0700 (PDT)
Received: (from jim@localhost)
	by hyperreal.org (8.8.5/8.8.5) id SAA05158
	for apache-cvs; Sun, 20 Jul 1997 18:21:35 -0700 (PDT)
Date: Sun, 20 Jul 1997 18:21:35 -0700 (PDT)
From: Jim Jagielski <jim@hyperreal.org>
Message-Id: <199707210121.SAA05158@hyperreal.org>
To: apache-cvs@hyperreal.org
Subject: cvs commit: apache/src/helpers TestLib
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

jim         97/07/20 18:21:34

  Modified:    src/helpers  TestLib
  Log:
  Add Dean's suggestions in... TestLib is now silent, we check it's
  exit status .
  
  Revision  Changes    Path
  1.6       +12 -12    apache/src/helpers/TestLib
  
  Index: TestLib
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/TestLib,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** TestLib	1997/07/21 00:16:19	1.5
  --- TestLib	1997/07/21 01:21:33	1.6
  ***************
  *** 1,5 ****
    #!/bin/sh
  ! trap 'rm -f Makefile dummy; exit' 0 1 2 3 15
    #
    # Yet another Apache Configure helper script.
    # This one exists simply to test for the existance of
  --- 1,6 ----
    #!/bin/sh
  ! exstat=1
  ! trap 'rm -f Makefile dummy; exit $exstat' 0 1 2 3 15
    #
    # Yet another Apache Configure helper script.
    # This one exists simply to test for the existance of
  ***************
  *** 20,26 ****
    # Make sure we have an argument
    #
    if [ "x$1" = "x" ]; then
  !   exit 1
    fi
    
    #
  --- 21,27 ----
    # Make sure we have an argument
    #
    if [ "x$1" = "x" ]; then
  !   exit
    fi
    
    #
  ***************
  *** 30,51 ****
    rm -f dummy
    cat ../Makefile.config > Makefile
    cat <<EOF >> Makefile
  ! CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  ! LIBS=$(EXTRA_LIBS) $(LIBS1)
  ! INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
  ! LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
    
  ! all:
    	\$(CC) \$(CFLAGS) \$(INCLUDES) \$(LDFLAGS) dummy.c -o dummy -l$1
    
    EOF
    
    # Now run that Makefile
  ! `make > /dev/null 2<&1`
    
  ! # And see if dummy exists
    if [ -f dummy ]; then
  !     echo "yes"
  ! else
  !     echo "no"
    fi
  --- 31,51 ----
    rm -f dummy
    cat ../Makefile.config > Makefile
    cat <<EOF >> Makefile
  ! CFLAGS=\$(OPTIM) \$(CFLAGS1) \$(EXTRA_CFLAGS)
  ! LIBS=\$(EXTRA_LIBS) \$(LIBS1)
  ! INCLUDES=\$(INCLUDES1) \$(EXTRA_INCLUDES)
  ! LDFLAGS=\$(LDFLAGS1) \$(EXTRA_LDFLAGS)
    
  ! dummy:
    	\$(CC) \$(CFLAGS) \$(INCLUDES) \$(LDFLAGS) dummy.c -o dummy -l$1
    
    EOF
    
    # Now run that Makefile
  ! make dummy > /dev/null 2<&1
    
  ! # And see if dummy exists, if so, then we assume the 
  ! # library we are testing for exists
    if [ -f dummy ]; then
  !     exstat=0
    fi