cvs commit: apache/src/helpers TestLib dummy.c testlib.c

[Dean Gaudet]

dgaudet     97/07/21 13:19:00

  Modified:    src/helpers  TestLib dummy.c
  Removed:     src/helpers  testlib.c
  Log:
  I really botched this up.  Jim had it right all along and I was misreading
  things.
  
  Revision  Changes    Path
  1.8       +7 -7      apache/src/helpers/TestLib
  
  Index: TestLib
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/TestLib,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** TestLib   1997/07/21 19:52:12     1.7
  --- TestLib   1997/07/21 20:18:59     1.8
  ***************
  *** 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
  --- 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
  ***************
  *** 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)
  --- 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)
  ***************
  *** 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
  --- 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
  
  
  
  1.2       +1 -0      apache/src/helpers/dummy.c
  
  Index: dummy.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/dummy.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** dummy.c   1997/07/17 02:56:37     1.1
  --- dummy.c   1997/07/21 20:18:59     1.2
  ***************
  *** 1,3 ****
  --- 1,4 ----
  + /* this file is used by TestLib */
    int main(void) {
        return 0;
    }