Ignore:
Timestamp:
Sep 13, 2009 2:24:20 PM (11 years ago)
Author:
stefan
Message:

revert my recent changes related to BSPsplit after copying them into branches

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/configure.ac

    r1388 r1411  
    1 # Copyright (C) 2007, 2009 International Business Machines.
     1# Copyright (C) 2007 International Business Machines.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    1717
    1818AC_COPYRIGHT([
    19 Copyright 2006, 2007, 2009 International Business Machines and others.
     19Copyright 2006 International Business Machines and others.
    2020All Rights Reserved.
    2121This file is part of the open source package Coin which is distributed
     
    6060
    6161# See what we're actually going to do for ASL. This will define ampllib.
    62 #AC_COIN_HAS_ASL
    63 
    64 # Determine the name of the ASL library
    65 case "$CC" in
    66   cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    67     ampllib=amplsolv.lib ;;
    68   *)
    69     ampllib=amplsolver.a ;;
    70 esac
    71 
    72 
    73 #MAKEOKFILE=.MakeOk
    74 #if test $coin_has_asl != no && test "$use_asldir" != BUILD; then
    75 #  skip_further_test=yes
    76 #  rm -f $MAKEOKFILE
    77 #  AC_MSG_NOTICE([The ASL sources don't need to be compiled])
    78 #  MAKEOKFILE=
    79 #else
    80 #  touch $MAKEOKFILE
    81 #fi
    82 #AC_SUBST(MAKEOKFILE)
    83 #AM_CONDITIONAL(SKIPMAKE, test -z "$MAKEOKFILE")
     62AC_COIN_HAS_ASL
     63
     64MAKEOKFILE=.MakeOk
     65if test $coin_has_asl != no && test "$use_asldir" != BUILD; then
     66  skip_further_test=yes
     67  rm -f $MAKEOKFILE
     68  AC_MSG_NOTICE([The ASL sources don't need to be compiled])
     69  MAKEOKFILE=
     70else
     71  touch $MAKEOKFILE
     72fi
     73AC_SUBST(MAKEOKFILE)
     74AM_CONDITIONAL(SKIPMAKE, test -z "$MAKEOKFILE")
    8475
    8576#############################################################################
     
    207198AM_CONDITIONAL(MSVC_COMPILE, test x$msvc_compile = xyes)
    208199
    209 AC_CONFIG_FILES([Makefile asl_addlibs.txt])
     200AC_CONFIG_FILES([Makefile])
    210201AC_CONFIG_FILES([compile_MS_ASL],[chmod a+x compile_MS_ASL])
    211202AC_CONFIG_FILES([compile_Unix_ASL],[chmod a+x compile_Unix_ASL])
Note: See TracChangeset for help on using the changeset viewer.