Received: (from majordom@localhost)
	by hyperreal.org (8.8.5/8.8.5) id MAA09025;
	Mon, 21 Jul 1997 12:52:20 -0700 (PDT)
Received: (from dgaudet@localhost)
	by hyperreal.org (8.8.5/8.8.5) id MAA08991
	for apache-cvs; Mon, 21 Jul 1997 12:52:16 -0700 (PDT)
Date: Mon, 21 Jul 1997 12:52:16 -0700 (PDT)
From: Dean Gaudet <dgaudet@hyperreal.org>
Message-Id: <199707211952.MAA08991@hyperreal.org>
To: apache-cvs@hyperreal.org
Subject: cvs commit: apache/src/helpers testlib.c TestLib
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

dgaudet     97/07/21 12:52:15

  Modified:    src/helpers  TestLib
  Added:       src/helpers  testlib.c
  Log:
  Use a file other than dummy.c, which belongs to the nt port.  testlib.c
  is a "complete" C program.
  
  Revision  Changes    Path
  1.7       +7 -7      apache/src/helpers/TestLib
  
  Index: TestLib
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/TestLib,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** TestLib	1997/07/21 01:21:33	1.6
  --- TestLib	1997/07/21 19:52:12	1.7
  ***************
  *** 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
  --- 1,6 ----
    #!/bin/sh
    exstat=1
  ! trap 'rm -f Makefile testlib; exit $exstat' 0 1 2 3 15
    #
    # Yet another Apache Configure helper script.
    # This one exists simply to test for the existance of
  ***************
  *** 28,34 ****
    # Get makefile settings and build a basic Makefile
    #
    cd ./helpers
  ! rm -f dummy
    cat ../Makefile.config > Makefile
    cat <<EOF >> Makefile
    CFLAGS=\$(OPTIM) \$(CFLAGS1) \$(EXTRA_CFLAGS)
  --- 28,34 ----
    # Get makefile settings and build a basic Makefile
    #
    cd ./helpers
  ! rm -f testlib
    cat ../Makefile.config > Makefile
    cat <<EOF >> Makefile
    CFLAGS=\$(OPTIM) \$(CFLAGS1) \$(EXTRA_CFLAGS)
  ***************
  *** 36,51 ****
    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
  --- 36,51 ----
    INCLUDES=\$(INCLUDES1) \$(EXTRA_INCLUDES)
    LDFLAGS=\$(LDFLAGS1) \$(EXTRA_LDFLAGS)
    
  ! testlib:
  ! 	\$(CC) \$(CFLAGS) \$(INCLUDES) \$(LDFLAGS) helpers/testlib.c -o testlib -l$1
    
    EOF
    
    # Now run that Makefile
  ! make testlib > /dev/null 2<&1
    
  ! # And see if testlib exists, if so, then we assume the 
    # library we are testing for exists
  ! if [ -f testlib ]; then
        exstat=0
    fi
  
  
  
  1.1                  apache/src/helpers/testlib.c
  
  Index: testlib.c
  ===================================================================
  void main(void)
  {
  }