Changeset 340


Ignore:
Timestamp:
Jun 1, 2006 12:10:18 AM (13 years ago)
Author:
andreasw
Message:

A number of unifying stylistic changes

Location:
trunk/Cbc
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.in

    r337 r340  
    6767        $(top_srcdir)/configure $(top_srcdir)/examples/Makefile.in \
    6868        $(top_srcdir)/inc/config_cbc.h.in AUTHORS INSTALL
    69 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@am__append_2 = .Externals-stamp
    70 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@am__append_3 = Externals
     69@HAVE_EXTERNALS_TRUE@am__append_2 = Externals
     70@HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
    7171subdir = .
    7272ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    7979mkinstalldirs = $(install_sh) -d
    8080CONFIG_HEADER = $(top_builddir)/inc/config_cbc.h
    81 CONFIG_CLEAN_FILES = examples/Makefile cbc_addlibs.txt \
    82         examples/sudoku_sample.csv examples/quad.mps \
    83         examples/quad2.mps
     81CONFIG_CLEAN_FILES = examples/Makefile cbc_addlibs.txt
    8482SOURCES =
    8583DIST_SOURCES =
     
    232230VOLOBJDIR = @VOLOBJDIR@
    233231VOLSRCDIR = @VOLSRCDIR@
     232VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    234233XPRINCDIR = @XPRINCDIR@
    235234XPRLIB = @XPRLIB@
     
    315314        examples/sample2.cpp examples/sample3.cpp examples/sample4.cpp \
    316315        examples/sample5.cpp examples/sos.cpp examples/sudoku.cpp \
    317         examples/sudoku_sample.csv $(am__append_3)
     316        examples/sudoku_sample.csv $(am__append_2)
    318317
    319318########################################################################
     
    327326
    328327# Files that are generated and should be cleaned with make distclean
    329 DISTCLEANFILES = $(am__append_2)
     328DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
    330329all: all-recursive
    331330
  • trunk/Cbc/configure

    r339 r340  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CDEFS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXXDEFS CXX CXXFLAGS ac_ct_CXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LT_LDFLAGS abs_lib_dir abs_include_dir abs_bin_dir RPATH_FLAGS CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE DYLPSRCDIR DYLPOBJDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE SYMSRCDIR SYMOBJDIR COIN_HAS_SYM_TRUE COIN_HAS_SYM_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE FMPINCDIR FMPLIB COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIB COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CDEFS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXXDEFS CXX CXXFLAGS ac_ct_CXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LT_LDFLAGS abs_lib_dir abs_include_dir abs_bin_dir RPATH_FLAGS CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE DYLPSRCDIR DYLPOBJDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE SYMSRCDIR SYMOBJDIR COIN_HAS_SYM_TRUE COIN_HAS_SYM_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE FMPINCDIR FMPLIB COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIB COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE LIBOBJS LTLIBOBJS VPATH_DISTCLEANFILES'
    476476ac_subst_files=''
    477477
     
    15671567
    15681568
     1569# Where should everything be installed by default?  Here, we want it
     1570# to be installed directly in 'bin', 'lib', 'include' subdirectories
     1571# of the directory where configure is run.  The default would be
     1572# /usr/local.
     1573
     1574
    15691575#############################################################################
    15701576#                         Standard build tool stuff                         #
     
    16301636
    16311637
    1632 # Where should everything be installed by default?  Here, we want it
    1633 # to be installed directly in 'bin', 'lib', 'include' subdirectories
    1634 # of the directory where configure is run.  The default would be
    1635 # /usr/local.
    1636 
    1637 
    16381638# If this project depends on external projects, the Externals file in
    16391639# the source root directory contains definition of where to find those
     
    16551655fi
    16561656
     1657
     1658# We set the following variable so that we know later in AC_COIN_FINALIZE
     1659# that we are in a project main directory
     1660coin_projectdir=yes
    16571661
    16581662
     
    45544558*-*-irix6*)
    45554559  # Find out which ABI we are using.
    4556   echo '#line 4556 "configure"' > conftest.$ac_ext
     4560  echo '#line 4560 "configure"' > conftest.$ac_ext
    45574561  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    45584562  (eval $ac_compile) 2>&5
     
    56885692
    56895693# Provide some information about the compiler.
    5690 echo "$as_me:5690:" \
     5694echo "$as_me:5694:" \
    56915695     "checking for Fortran 77 compiler version" >&5
    56925696ac_compiler=`set X $ac_compile; echo $2`
     
    67556759   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    67566760   -e 's:$: $lt_compiler_flag:'`
    6757    (eval echo "\"\$as_me:6757: $lt_compile\"" >&5)
     6761   (eval echo "\"\$as_me:6761: $lt_compile\"" >&5)
    67586762   (eval "$lt_compile" 2>conftest.err)
    67596763   ac_status=$?
    67606764   cat conftest.err >&5
    6761    echo "$as_me:6761: \$? = $ac_status" >&5
     6765   echo "$as_me:6765: \$? = $ac_status" >&5
    67626766   if (exit $ac_status) && test -s "$ac_outfile"; then
    67636767     # The compiler can only warn and ignore the option if not recognized
     
    70237027   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    70247028   -e 's:$: $lt_compiler_flag:'`
    7025    (eval echo "\"\$as_me:7025: $lt_compile\"" >&5)
     7029   (eval echo "\"\$as_me:7029: $lt_compile\"" >&5)
    70267030   (eval "$lt_compile" 2>conftest.err)
    70277031   ac_status=$?
    70287032   cat conftest.err >&5
    7029    echo "$as_me:7029: \$? = $ac_status" >&5
     7033   echo "$as_me:7033: \$? = $ac_status" >&5
    70307034   if (exit $ac_status) && test -s "$ac_outfile"; then
    70317035     # The compiler can only warn and ignore the option if not recognized
     
    71277131   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    71287132   -e 's:$: $lt_compiler_flag:'`
    7129    (eval echo "\"\$as_me:7129: $lt_compile\"" >&5)
     7133   (eval echo "\"\$as_me:7133: $lt_compile\"" >&5)
    71307134   (eval "$lt_compile" 2>out/conftest.err)
    71317135   ac_status=$?
    71327136   cat out/conftest.err >&5
    7133    echo "$as_me:7133: \$? = $ac_status" >&5
     7137   echo "$as_me:7137: \$? = $ac_status" >&5
    71347138   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    71357139   then
     
    94729476  lt_status=$lt_dlunknown
    94739477  cat > conftest.$ac_ext <<EOF
    9474 #line 9474 "configure"
     9478#line 9478 "configure"
    94759479#include "confdefs.h"
    94769480
     
    95729576  lt_status=$lt_dlunknown
    95739577  cat > conftest.$ac_ext <<EOF
    9574 #line 9574 "configure"
     9578#line 9578 "configure"
    95759579#include "confdefs.h"
    95769580
     
    1191611920   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1191711921   -e 's:$: $lt_compiler_flag:'`
    11918    (eval echo "\"\$as_me:11918: $lt_compile\"" >&5)
     11922   (eval echo "\"\$as_me:11922: $lt_compile\"" >&5)
    1191911923   (eval "$lt_compile" 2>conftest.err)
    1192011924   ac_status=$?
    1192111925   cat conftest.err >&5
    11922    echo "$as_me:11922: \$? = $ac_status" >&5
     11926   echo "$as_me:11926: \$? = $ac_status" >&5
    1192311927   if (exit $ac_status) && test -s "$ac_outfile"; then
    1192411928     # The compiler can only warn and ignore the option if not recognized
     
    1202012024   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1202112025   -e 's:$: $lt_compiler_flag:'`
    12022    (eval echo "\"\$as_me:12022: $lt_compile\"" >&5)
     12026   (eval echo "\"\$as_me:12026: $lt_compile\"" >&5)
    1202312027   (eval "$lt_compile" 2>out/conftest.err)
    1202412028   ac_status=$?
    1202512029   cat out/conftest.err >&5
    12026    echo "$as_me:12026: \$? = $ac_status" >&5
     12030   echo "$as_me:12030: \$? = $ac_status" >&5
    1202712031   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1202812032   then
     
    1359013594   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1359113595   -e 's:$: $lt_compiler_flag:'`
    13592    (eval echo "\"\$as_me:13592: $lt_compile\"" >&5)
     13596   (eval echo "\"\$as_me:13596: $lt_compile\"" >&5)
    1359313597   (eval "$lt_compile" 2>conftest.err)
    1359413598   ac_status=$?
    1359513599   cat conftest.err >&5
    13596    echo "$as_me:13596: \$? = $ac_status" >&5
     13600   echo "$as_me:13600: \$? = $ac_status" >&5
    1359713601   if (exit $ac_status) && test -s "$ac_outfile"; then
    1359813602     # The compiler can only warn and ignore the option if not recognized
     
    1369413698   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1369513699   -e 's:$: $lt_compiler_flag:'`
    13696    (eval echo "\"\$as_me:13696: $lt_compile\"" >&5)
     13700   (eval echo "\"\$as_me:13700: $lt_compile\"" >&5)
    1369713701   (eval "$lt_compile" 2>out/conftest.err)
    1369813702   ac_status=$?
    1369913703   cat out/conftest.err >&5
    13700    echo "$as_me:13700: \$? = $ac_status" >&5
     13704   echo "$as_me:13704: \$? = $ac_status" >&5
    1370113705   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1370213706   then
     
    1590115905   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1590215906   -e 's:$: $lt_compiler_flag:'`
    15903    (eval echo "\"\$as_me:15903: $lt_compile\"" >&5)
     15907   (eval echo "\"\$as_me:15907: $lt_compile\"" >&5)
    1590415908   (eval "$lt_compile" 2>conftest.err)
    1590515909   ac_status=$?
    1590615910   cat conftest.err >&5
    15907    echo "$as_me:15907: \$? = $ac_status" >&5
     15911   echo "$as_me:15911: \$? = $ac_status" >&5
    1590815912   if (exit $ac_status) && test -s "$ac_outfile"; then
    1590915913     # The compiler can only warn and ignore the option if not recognized
     
    1616916173   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1617016174   -e 's:$: $lt_compiler_flag:'`
    16171    (eval echo "\"\$as_me:16171: $lt_compile\"" >&5)
     16175   (eval echo "\"\$as_me:16175: $lt_compile\"" >&5)
    1617216176   (eval "$lt_compile" 2>conftest.err)
    1617316177   ac_status=$?
    1617416178   cat conftest.err >&5
    16175    echo "$as_me:16175: \$? = $ac_status" >&5
     16179   echo "$as_me:16179: \$? = $ac_status" >&5
    1617616180   if (exit $ac_status) && test -s "$ac_outfile"; then
    1617716181     # The compiler can only warn and ignore the option if not recognized
     
    1627316277   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1627416278   -e 's:$: $lt_compiler_flag:'`
    16275    (eval echo "\"\$as_me:16275: $lt_compile\"" >&5)
     16279   (eval echo "\"\$as_me:16279: $lt_compile\"" >&5)
    1627616280   (eval "$lt_compile" 2>out/conftest.err)
    1627716281   ac_status=$?
    1627816282   cat out/conftest.err >&5
    16279    echo "$as_me:16279: \$? = $ac_status" >&5
     16283   echo "$as_me:16283: \$? = $ac_status" >&5
    1628016284   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1628116285   then
     
    1968219686esac
    1968319687
    19684 # Unless we are on Darwin, we want to use the -no-undefined flag for
    19685 # libtool to be able to create shared objects
    19686 case $build in
    19687   *-darwin*)
    19688     LT_LDFLAGS=
    19689     ;;
    19690   *)
    19691     LT_LDFLAGS=-no-undefined
    19692     ;;
    19693 esac
     19688# ToDo
     19689# For now, don't use the -no-undefined flag, since the Makefiles are
     19690# not yet set up that way.  But we need to fix this, when we want
     19691# to comile DLLs under Windows.
     19692LT_LDFLAGS=
    1969419693
    1969519694
     
    2106821067
    2106921068if test $coin_vpath_config = yes; then
    21070             ac_config_links="$ac_config_links examples/sudoku_sample.csv:examples/sudoku_sample.csv"
    21071 
     21069  coin_vpath_link_files="$coin_vpath_link_files examples/sudoku_sample.csv"
    2107221070fi
    2107321071
    2107421072
    2107521073if test $coin_vpath_config = yes; then
    21076             ac_config_links="$ac_config_links examples/quad.mps:examples/quad.mps"
    21077 
     21074  coin_vpath_link_files="$coin_vpath_link_files examples/quad.mps"
    2107821075fi
    2107921076
    2108021077
    2108121078if test $coin_vpath_config = yes; then
    21082             ac_config_links="$ac_config_links examples/quad2.mps:examples/quad2.mps"
    21083 
     21079  coin_vpath_link_files="$coin_vpath_link_files examples/quad2.mps"
    2108421080fi
    2108521081
     
    2109921095
    2110021096# Finally, we let configure write all the output...
     21097
    2110121098cat >confcache <<\_ACEOF
    2110221099# This file is a shell script that caches the results of configure
     
    2179821795  "src/CbcOrClpParam.cpp" ) CONFIG_LINKS="$CONFIG_LINKS src/CbcOrClpParam.cpp:../Clp/src/CbcOrClpParam.cpp" ;;
    2179921796  "src/CbcOrClpParam.hpp" ) CONFIG_LINKS="$CONFIG_LINKS src/CbcOrClpParam.hpp:../Clp/src/CbcOrClpParam.hpp" ;;
    21800   "examples/sudoku_sample.csv" ) CONFIG_LINKS="$CONFIG_LINKS examples/sudoku_sample.csv:examples/sudoku_sample.csv" ;;
    21801   "examples/quad.mps" ) CONFIG_LINKS="$CONFIG_LINKS examples/quad.mps:examples/quad.mps" ;;
    21802   "examples/quad2.mps" ) CONFIG_LINKS="$CONFIG_LINKS examples/quad2.mps:examples/quad2.mps" ;;
    2180321797  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2180421798  "inc/config_cbc.h" ) CONFIG_HEADERS="$CONFIG_HEADERS inc/config_cbc.h" ;;
     
    2289222886
    2289322887
    22894 # ...and tell the user, that the configuration finished
    22895 { echo "$as_me:$LINENO: Cbc configuration successful" >&5
    22896 echo "$as_me: Cbc configuration successful" >&6;}
     22888if test x"$coin_vpath_link_files" = x; then : ; else
     22889  { echo "$as_me:$LINENO: Creating VPATH links for data files" >&5
     22890echo "$as_me: Creating VPATH links for data files" >&6;}
     22891  for file in $coin_vpath_link_files; do
     22892    rm -f $file
     22893    $LN_S $srcdir/$file $file
     22894  done
     22895fi
     22896
     22897# Define VPATH_DISTCLEANFILES to be everything that needs to be
     22898# cleaned for distclean in a vpath configuration
     22899
     22900VPATH_DISTCLEANFILES="$coin_vpath_link_files"
     22901
     22902if test x$coin_projectdir = xyes; then
     22903  { echo "$as_me:$LINENO: Configuration of $PACKAGE_NAME successful" >&5
     22904echo "$as_me: Configuration of $PACKAGE_NAME successful" >&6;}
     22905else
     22906  { echo "$as_me:$LINENO: Main configuration of $PACKAGE_NAME successful" >&5
     22907echo "$as_me: Main configuration of $PACKAGE_NAME successful" >&6;}
     22908fi
     22909
  • trunk/Cbc/configure.ac

    r339 r340  
    2525AC_CONFIG_SRCDIR(src/CbcTree.hpp)
    2626
     27# Where should everything be installed by default?  Here, we want it
     28# to be installed directly in 'bin', 'lib', 'include' subdirectories
     29# of the directory where configure is run.  The default would be
     30# /usr/local.
     31AC_PREFIX_DEFAULT([`pwd`])
     32
    2733#############################################################################
    2834#                         Standard build tool stuff                         #
     
    3238AC_CANONICAL_BUILD
    3339
    34 # Where should everything be installed by default?  Here, we want it
    35 # to be installed directly in 'bin', 'lib', 'include' subdirectories
    36 # of the directory where configure is run.  The default would be
    37 # /usr/local.
    38 AC_PREFIX_DEFAULT([`pwd`])
    39 
    4040# If this project depends on external projects, the Externals file in
    4141# the source root directory contains definition of where to find those
    4242# externals.  The following macro ensures that those externals are
    4343# retrieved by svn if they are not there yet.
    44 AC_COIN_SRCDIR_INIT
     44AC_COIN_PROJECTDIR_INIT
    4545
    4646# Check if user wants to produce debugging code
     
    139139
    140140# Finally, we let configure write all the output...
    141 AC_OUTPUT
    142 
    143 # ...and tell the user, that the configuration finished
    144 AC_MSG_NOTICE([Cbc configuration successful])
     141AC_COIN_FINALIZE
  • trunk/Cbc/src/Makefile.in

    r333 r340  
    367367VOLOBJDIR = @VOLOBJDIR@
    368368VOLSRCDIR = @VOLSRCDIR@
     369VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    369370XPRINCDIR = @XPRINCDIR@
    370371XPRLIB = @XPRLIB@
  • trunk/Cbc/test/Makefile.in

    r332 r340  
    183183VOLOBJDIR = @VOLOBJDIR@
    184184VOLSRCDIR = @VOLSRCDIR@
     185VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    185186XPRINCDIR = @XPRINCDIR@
    186187XPRLIB = @XPRLIB@
Note: See TracChangeset for help on using the changeset viewer.