Changeset 778


Ignore:
Timestamp:
May 25, 2006 11:11:37 AM (13 years ago)
Author:
andreasw
Message:

corrected Externals to exclude MSDevStudio; made Clp examples to work

Location:
trunk/Clp
Files:
3 deleted
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r776 r778  
    6363        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    6464        $(srcdir)/clp_addlibs.txt.in $(top_srcdir)/configure \
     65        $(top_srcdir)/examples/Makefile.in \
    6566        $(top_srcdir)/inc/config_clp.h.in AUTHORS INSTALL
    6667@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@am__append_2 = .Externals-stamp
     
    7677mkinstalldirs = $(install_sh) -d
    7778CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
    78 CONFIG_CLEAN_FILES = clp_addlibs.txt
     79CONFIG_CLEAN_FILES = examples/Makefile clp_addlibs.txt \
     80        examples/hello.mps examples/input.130
    7981SOURCES =
    8082DIST_SOURCES =
     
    162164MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
    163165MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    164 MAINTAINER_SMALL_FALSE = @MAINTAINER_SMALL_FALSE@
    165 MAINTAINER_SMALL_TRUE = @MAINTAINER_SMALL_TRUE@
    166166MAKEINFO = @MAKEINFO@
    167167OBJEXT = @OBJEXT@
     
    174174PATH_SEPARATOR = @PATH_SEPARATOR@
    175175RANLIB = @RANLIB@
     176RPATH_FLAGS = @RPATH_FLAGS@
    176177SET_MAKE = @SET_MAKE@
    177178SHELL = @SHELL@
    178179STRIP = @STRIP@
    179180VERSION = @VERSION@
     181abs_bin_dir = @abs_bin_dir@
     182abs_include_dir = @abs_include_dir@
     183abs_lib_dir = @abs_lib_dir@
    180184ac_ct_AR = @ac_ct_AR@
    181185ac_ct_CC = @ac_ct_CC@
     
    217221mkdir_p = @mkdir_p@
    218222oldincludedir = @oldincludedir@
    219 pkg_bin_dir = @pkg_bin_dir@
    220 pkg_include_dir = @pkg_include_dir@
    221 pkg_lib_dir = @pkg_lib_dir@
    222223prefix = @prefix@
    223224program_transform_name = @program_transform_name@
     
    308309distclean-hdr:
    309310        -rm -f inc/config_clp.h inc/stamp-h1
     311examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/Makefile.in
     312        cd $(top_builddir) && $(SHELL) ./config.status $@
    310313clp_addlibs.txt: $(top_builddir)/config.status $(srcdir)/clp_addlibs.txt.in
    311314        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    456459        $(am__remove_distdir)
    457460        mkdir $(distdir)
    458         $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/inc
     461        $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/examples $(distdir)/inc
    459462        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    460463        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    729732@MAINTAINER_MODE_TRUE@  cp $< $@
    730733
    731 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/config.guess: $(BUILDTOOLSDIR)/config.guess
    732 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
    733 
    734 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/config.sub: $(BUILDTOOLSDIR)/config.sub
    735 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
    736 
    737 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/depcomp: $(BUILDTOOLSDIR)/depcomp
    738 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
    739 
    740 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/ltmain.sh: $(BUILDTOOLSDIR)/ltmain.sh
    741 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
     734@MAINTAINER_MODE_TRUE@$(AUX_DIR)/config.guess: $(BUILDTOOLSDIR)/config.guess
     735@MAINTAINER_MODE_TRUE@  cp $< $@
     736
     737@MAINTAINER_MODE_TRUE@$(AUX_DIR)/config.sub: $(BUILDTOOLSDIR)/config.sub
     738@MAINTAINER_MODE_TRUE@  cp $< $@
     739
     740@MAINTAINER_MODE_TRUE@$(AUX_DIR)/depcomp: $(BUILDTOOLSDIR)/depcomp
     741@MAINTAINER_MODE_TRUE@  cp $< $@
     742
     743@MAINTAINER_MODE_TRUE@$(AUX_DIR)/ltmain.sh: $(BUILDTOOLSDIR)/ltmain.sh
     744@MAINTAINER_MODE_TRUE@  cp $< $@
    742745
    743746# Take care of updating externals (if Externals file exists)
  • trunk/Clp/configure

    r776 r778  
    474474#endif"
    475475
    476 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 MAINTAINER_SMALL_TRUE MAINTAINER_SMALL_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 pkg_lib_dir pkg_include_dir pkg_bin_dir COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE LIBOBJS LTLIBOBJS'
     476ac_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 COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE LIBOBJS LTLIBOBJS'
    477477ac_subst_files=''
    478478
     
    1931319313
    1931419314coin_have_externals=no
    19315 coin_maintainer_small=no
    1931619315if test "$enable_maintainer_mode" = yes; then
    1931719316
     
    1956219561  fi
    1956319562
    19564   # Check if this is a limited project (without config.guess)
    19565   if test -r $srcdir/config.guess; then :; else
    19566     coin_maintainer_small=yes
    19567   fi
    19568 
    1956919563  # Find the location of the BuildTools directory
    1957019564  BUILDTOOLSDIR=
     
    1960319597
    1960419598
    19605 if test $coin_maintainer_small = yes; then
    19606   MAINTAINER_SMALL_TRUE=
    19607   MAINTAINER_SMALL_FALSE='#'
    19608 else
    19609   MAINTAINER_SMALL_TRUE='#'
    19610   MAINTAINER_SMALL_FALSE=
    19611 fi
    19612 
    19613 
    19614 
    1961519599# Stuff for libtool
    1961619600
     
    1969219676
    1969319677# helpful variable for the base directory of this package
    19694 pkg_source_dir=`cd $srcdir; pwd`
     19678abs_source_dir=`cd $srcdir; pwd`
    1969519679
    1969619680# Stuff for example Makefiles
    19697 full_prefix=`echo $exec_prefix | pwd`
    19698 
    19699 pkg_lib_dir=$full_prefix/lib
    19700 
    19701 pkg_include_dir=$full_prefix/include
    19702 
    19703 pkg_bin_dir=$full_prefix/bin
     19681if test x$prefix = xNONE; then
     19682  full_prefix=$ac_default_prefix
     19683else
     19684  full_prefix=$prefix
     19685fi
     19686full_prefix=`cd $full_prefix ; pwd`
     19687
     19688abs_lib_dir=$full_prefix/lib
     19689
     19690abs_include_dir=$full_prefix/include
     19691
     19692abs_bin_dir=$full_prefix/bin
     19693
     19694# set RPATH_FLAGS to the compiler link flags required to hardcode location
     19695# of the shared objects
     19696RPATH_FLAGS=
     19697
     19698if test $enable_shared = yes; then
     19699  if test "$GXX" = "yes"; then
     19700    RPATH_FLAGS=
     19701    for dir in $abs_lib_dir; do
     19702      RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
     19703    done
     19704  else
     19705    case $build in
     19706      *-linux-*)
     19707        case "$CXX" in
     19708        icpc | */icpc)
     19709          RPATH_FLAGS=
     19710          for dir in $abs_lib_dir; do
     19711            RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
     19712          done
     19713        esac ;;
     19714      *-ibm-*)
     19715        case "$CXX" in
     19716        xlC* | */xlC* | mpxlC* | */mpxlC*)
     19717          RPATH_FLAGS=nothing ;;
     19718        esac ;;
     19719      *-hp-*)
     19720          RPATH_FLAGS=nothing ;;
     19721      *-mingw32)
     19722          RPATH_FLAGS=nothing ;;
     19723      *-sun-*)
     19724          RPATH_FLAGS=
     19725          for dir in $abs_lib_dir; do
     19726            RPATH_FLAGS="$RPATH_FLAGS -R$dir"
     19727          done
     19728     esac
     19729  fi
     19730
     19731  if test "$RPATH_FLAGS" = ""; then
     19732    { echo "$as_me:$LINENO: WARNING: Could not automatically determine how to tell the linker about automatic inclusion of the path for shared libraries.  The test examples might not work if you link against shared objects.  You will need to set the LD_LIBRARY_PATH or LIBDIR variable manually." >&5
     19733echo "$as_me: WARNING: Could not automatically determine how to tell the linker about automatic inclusion of the path for shared libraries.  The test examples might not work if you link against shared objects.  You will need to set the LD_LIBRARY_PATH or LIBDIR variable manually." >&2;}
     19734  fi
     19735  if test "$RPATH_FLAGS" = "nothing"; then
     19736    RPATH_FLAGS=
     19737  fi
     19738fi
     19739
     19740
    1970419741
    1970519742
     
    2010720144
    2010820145##############################################################################
     20146#                   VPATH links for example input files                      #
     20147##############################################################################
     20148
     20149# In case this is a VPATH configuration we need to make sure that the
     20150# input files for the examples are available in the VPATH directory.
     20151
     20152echo "$as_me:$LINENO: checking whether this is a VPATH configuration" >&5
     20153echo $ECHO_N "checking whether this is a VPATH configuration... $ECHO_C" >&6
     20154if test `cd $srcdir; pwd` != `pwd`; then
     20155  coin_vpath_config=yes;
     20156else
     20157  coin_vpath_config=no;
     20158fi
     20159echo "$as_me:$LINENO: result: $coin_vpath_config" >&5
     20160echo "${ECHO_T}$coin_vpath_config" >&6
     20161
     20162
     20163if test $coin_vpath_config = yes; then
     20164            ac_config_links="$ac_config_links examples/hello.mps:examples/hello.mps"
     20165
     20166fi
     20167
     20168
     20169if test $coin_vpath_config = yes; then
     20170            ac_config_links="$ac_config_links examples/input.130:examples/input.130"
     20171
     20172fi
     20173
     20174
     20175##############################################################################
    2010920176#                   Finishing up by writing all the output                   #
    2011020177##############################################################################
     
    2011220179# Here list all the files that configure should create (except for the
    2011320180# configuration header file)
    20114                                         ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile clp_addlibs.txt"
     20181                                                  ac_config_files="$ac_config_files Makefile examples/Makefile src/Makefile test/Makefile clp_addlibs.txt"
    2011520182
    2011620183
     
    2025720324Usually this means the macro was only invoked conditionally." >&5
    2025820325echo "$as_me: error: conditional \"HAVE_EXTERNALS\" was never defined.
    20259 Usually this means the macro was only invoked conditionally." >&2;}
    20260    { (exit 1); exit 1; }; }
    20261 fi
    20262 if test -z "${MAINTAINER_SMALL_TRUE}" && test -z "${MAINTAINER_SMALL_FALSE}"; then
    20263   { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_SMALL\" was never defined.
    20264 Usually this means the macro was only invoked conditionally." >&5
    20265 echo "$as_me: error: conditional \"MAINTAINER_SMALL\" was never defined.
    2026620326Usually this means the macro was only invoked conditionally." >&2;}
    2026720327   { (exit 1); exit 1; }; }
     
    2060720667$config_headers
    2060820668
     20669Configuration links:
     20670$config_links
     20671
    2060920672Configuration commands:
    2061020673$config_commands
     
    2072620789  # Handling of arguments.
    2072720790  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     20791  "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
    2072820792  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    2072920793  "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
    2073020794  "clp_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES clp_addlibs.txt" ;;
     20795  "examples/hello.mps" ) CONFIG_LINKS="$CONFIG_LINKS examples/hello.mps:examples/hello.mps" ;;
     20796  "examples/input.130" ) CONFIG_LINKS="$CONFIG_LINKS examples/input.130:examples/input.130" ;;
    2073120797  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2073220798  "inc/config_clp.h" ) CONFIG_HEADERS="$CONFIG_HEADERS inc/config_clp.h" ;;
     
    2074420810  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
    2074520811  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
     20812  test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
    2074620813  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
    2074720814fi
     
    2088220949s,@HAVE_EXTERNALS_TRUE@,$HAVE_EXTERNALS_TRUE,;t t
    2088320950s,@HAVE_EXTERNALS_FALSE@,$HAVE_EXTERNALS_FALSE,;t t
    20884 s,@MAINTAINER_SMALL_TRUE@,$MAINTAINER_SMALL_TRUE,;t t
    20885 s,@MAINTAINER_SMALL_FALSE@,$MAINTAINER_SMALL_FALSE,;t t
    2088620951s,@host@,$host,;t t
    2088720952s,@host_cpu@,$host_cpu,;t t
     
    2090120966s,@LIBTOOL@,$LIBTOOL,;t t
    2090220967s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
    20903 s,@pkg_lib_dir@,$pkg_lib_dir,;t t
    20904 s,@pkg_include_dir@,$pkg_include_dir,;t t
    20905 s,@pkg_bin_dir@,$pkg_bin_dir,;t t
     20968s,@abs_lib_dir@,$abs_lib_dir,;t t
     20969s,@abs_include_dir@,$abs_include_dir,;t t
     20970s,@abs_bin_dir@,$abs_bin_dir,;t t
     20971s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
    2090620972s,@COINUTILSSRCDIR@,$COINUTILSSRCDIR,;t t
    2090720973s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
     
    2139521461          /^X\(\/\).*/{ s//\1/; q; }
    2139621462          s/.*/./; q'`/stamp-h$_am_stamp_count
     21463done
     21464_ACEOF
     21465cat >>$CONFIG_STATUS <<\_ACEOF
     21466
     21467#
     21468# CONFIG_LINKS section.
     21469#
     21470
     21471for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue
     21472  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
     21473  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
     21474
     21475  { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5
     21476echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
     21477
     21478  if test ! -r $srcdir/$ac_source; then
     21479    { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
     21480echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
     21481   { (exit 1); exit 1; }; }
     21482  fi
     21483  rm -f $ac_dest
     21484
     21485  # Make relative symlinks.
     21486  ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
     21487$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     21488         X"$ac_dest" : 'X\(//\)[^/]' \| \
     21489         X"$ac_dest" : 'X\(//\)$' \| \
     21490         X"$ac_dest" : 'X\(/\)' \| \
     21491         .     : '\(.\)' 2>/dev/null ||
     21492echo X"$ac_dest" |
     21493    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
     21494          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
     21495          /^X\(\/\/\)$/{ s//\1/; q; }
     21496          /^X\(\/\).*/{ s//\1/; q; }
     21497          s/.*/./; q'`
     21498  { if $as_mkdir_p; then
     21499    mkdir -p "$ac_dest_dir"
     21500  else
     21501    as_dir="$ac_dest_dir"
     21502    as_dirs=
     21503    while test ! -d "$as_dir"; do
     21504      as_dirs="$as_dir $as_dirs"
     21505      as_dir=`(dirname "$as_dir") 2>/dev/null ||
     21506$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     21507         X"$as_dir" : 'X\(//\)[^/]' \| \
     21508         X"$as_dir" : 'X\(//\)$' \| \
     21509         X"$as_dir" : 'X\(/\)' \| \
     21510         .     : '\(.\)' 2>/dev/null ||
     21511echo X"$as_dir" |
     21512    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
     21513          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
     21514          /^X\(\/\/\)$/{ s//\1/; q; }
     21515          /^X\(\/\).*/{ s//\1/; q; }
     21516          s/.*/./; q'`
     21517    done
     21518    test ! -n "$as_dirs" || mkdir $as_dirs
     21519  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5
     21520echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;}
     21521   { (exit 1); exit 1; }; }; }
     21522
     21523  ac_builddir=.
     21524
     21525if test "$ac_dest_dir" != .; then
     21526  ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'`
     21527  # A "../" for each directory in $ac_dir_suffix.
     21528  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
     21529else
     21530  ac_dir_suffix= ac_top_builddir=
     21531fi
     21532
     21533case $srcdir in
     21534  .)  # No --srcdir option.  We are building in place.
     21535    ac_srcdir=.
     21536    if test -z "$ac_top_builddir"; then
     21537       ac_top_srcdir=.
     21538    else
     21539       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
     21540    fi ;;
     21541  [\\/]* | ?:[\\/]* )  # Absolute path.
     21542    ac_srcdir=$srcdir$ac_dir_suffix;
     21543    ac_top_srcdir=$srcdir ;;
     21544  *) # Relative path.
     21545    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     21546    ac_top_srcdir=$ac_top_builddir$srcdir ;;
     21547esac
     21548
     21549# Do not use `cd foo && pwd` to compute absolute paths, because
     21550# the directories may not exist.
     21551case `pwd` in
     21552.) ac_abs_builddir="$ac_dest_dir";;
     21553*)
     21554  case "$ac_dest_dir" in
     21555  .) ac_abs_builddir=`pwd`;;
     21556  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";;
     21557  *) ac_abs_builddir=`pwd`/"$ac_dest_dir";;
     21558  esac;;
     21559esac
     21560case $ac_abs_builddir in
     21561.) ac_abs_top_builddir=${ac_top_builddir}.;;
     21562*)
     21563  case ${ac_top_builddir}. in
     21564  .) ac_abs_top_builddir=$ac_abs_builddir;;
     21565  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
     21566  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
     21567  esac;;
     21568esac
     21569case $ac_abs_builddir in
     21570.) ac_abs_srcdir=$ac_srcdir;;
     21571*)
     21572  case $ac_srcdir in
     21573  .) ac_abs_srcdir=$ac_abs_builddir;;
     21574  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
     21575  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
     21576  esac;;
     21577esac
     21578case $ac_abs_builddir in
     21579.) ac_abs_top_srcdir=$ac_top_srcdir;;
     21580*)
     21581  case $ac_top_srcdir in
     21582  .) ac_abs_top_srcdir=$ac_abs_builddir;;
     21583  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
     21584  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
     21585  esac;;
     21586esac
     21587
     21588
     21589  case $srcdir in
     21590  [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
     21591      *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;;
     21592  esac
     21593
     21594  # Try a symlink, then a hard link, then a copy.
     21595  ln -s $ac_rel_source $ac_dest 2>/dev/null ||
     21596    ln $srcdir/$ac_source $ac_dest 2>/dev/null ||
     21597    cp -p $srcdir/$ac_source $ac_dest ||
     21598    { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5
     21599echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;}
     21600   { (exit 1); exit 1; }; }
    2139721601done
    2139821602_ACEOF
  • trunk/Clp/configure.ac

    r774 r778  
    6969
    7070##############################################################################
     71#                   VPATH links for example input files                      #
     72##############################################################################
     73
     74# In case this is a VPATH configuration we need to make sure that the
     75# input files for the examples are available in the VPATH directory.
     76
     77AC_COIN_VPATH_LINK(examples/hello.mps)
     78AC_COIN_VPATH_LINK(examples/input.130)
     79
     80##############################################################################
    7181#                   Finishing up by writing all the output                   #
    7282##############################################################################
     
    7585# configuration header file)
    7686AC_CONFIG_FILES([Makefile
     87                 examples/Makefile
    7788                 src/Makefile
    7889                 test/Makefile
  • trunk/Clp/examples/addBits.cpp

    r546 r778  
    3535  // Empty model
    3636  ClpSimplex  model;
    37   std::string mpsFileName = "../../Mps/Netlib/25fv47.mps";
     37  std::string mpsFileName = "../../Data/Netlib/25fv47.mps";
    3838  if (argc>=2) mpsFileName = argv[1];
    3939  int status=model.readMps(mpsFileName.c_str(),true);
  • trunk/Clp/examples/addColumns.cpp

    r579 r778  
    183183    int status;
    184184    if (argc<2)
    185       status=model.readMps("../../Mps/Sample/p0033.mps");
     185      status=model.readMps("../../Data/Sample/p0033.mps");
    186186    else
    187187      status=model.readMps(argv[1]);
     
    227227    int status;
    228228    if (argc<2)
    229       status=model.readMps("../../Mps/Sample/p0033.mps");
     229      status=model.readMps("../../Data/Sample/p0033.mps");
    230230    else
    231231      status=model.readMps(argv[1]);
  • trunk/Clp/examples/decompose.cpp

    r423 r778  
    1313  if (argc<2) {
    1414    //status=model.readMps("/home/forrest/data/ken-18.mps.gz",true);
    15     status=model.readMps("../../Mps/Netlib/czprob.mps",true);
     15    status=model.readMps("../../Data/Netlib/czprob.mps",true);
    1616  } else {
    1717    status=model.readMps(argv[1],true);
  • trunk/Clp/examples/defaults.cpp

    r50 r778  
    1313  // Keep names
    1414  if (argc<2)
    15     status=model.readMps("../../Mps/Sample/p0033.mps",true);
     15    status=model.readMps("../../Data/Sample/p0033.mps",true);
    1616  else
    1717    status=model.readMps(argv[1],true);
  • trunk/Clp/examples/driver.cpp

    r384 r778  
    1111  // Keep names when reading an mps file
    1212  if (argc<2)
    13     status=model.readMps("../../Mps/Sample/p0033.mps",true);
     13    status=model.readMps("../../Data/Sample/p0033.mps",true);
    1414  else
    1515    status=model.readMps(argv[1],true);
  • trunk/Clp/examples/driver2.cpp

    r250 r778  
    183183  // Keep names when reading an mps file
    184184  if (argc<2)
    185     status=model.readMps("../../Mps/Sample/p0033.mps",true);
     185    status=model.readMps("../../Data/Sample/p0033.mps",true);
    186186  else
    187187    status=model.readMps(argv[1],true);
  • trunk/Clp/examples/driverC.c

    r272 r778  
    4141  /* Keep names when reading an mps file */
    4242  if (argc<2)
    43     status=Clp_readMps(model,"../../Mps/Sample/p0033.mps",1,0);
     43    status=Clp_readMps(model,"../../Data/Sample/p0033.mps",1,0);
    4444  else
    4545    status=Clp_readMps(model,argv[1],1,0);
  • trunk/Clp/examples/ekk.cpp

    r625 r778  
    6464    name=argv[1];
    6565  } else {
    66     name="../../Mps/Sample/p0033.mps";
     66    name="../../Data/Sample/p0033.mps";
    6767  }
    6868
  • trunk/Clp/examples/makeDual.cpp

    r610 r778  
    1010  int status;
    1111  if (argc<2)
    12     status=model.readMps("../../Mps/Sample/p0033.mps");
     12    status=model.readMps("../../Data/Sample/p0033.mps");
    1313  else
    1414    status=model.readMps(argv[1]);
  • trunk/Clp/examples/minimum.cpp

    r2 r778  
    88  int status;
    99  if (argc<2)
    10     status=model.readMps("../../Mps/Sample/p0033.mps");
     10    status=model.readMps("../../Data/Sample/p0033.mps");
    1111  else
    1212    status=model.readMps(argv[1]);
  • trunk/Clp/examples/testBarrier.cpp

    r709 r778  
    1111  int status;
    1212  if (argc<2)
    13     status=model.readMps("../../Mps/Sample/p0033.mps");
     13    status=model.readMps("../../Data/Sample/p0033.mps");
    1414  else
    1515    status=model.readMps(argv[1]);
  • trunk/Clp/examples/testGub.cpp

    r493 r778  
    1515  int maxFactor=100;
    1616  if (argc<2) {
    17     status=model.readMps("../../Mps/Netlib/czprob.mps");
     17    status=model.readMps("../../Data/Netlib/czprob.mps");
    1818    if (status) {
    1919      printf("Unable to read matrix - trying gzipped version\n");
    20       status=model.readMps("../../Mps/Netlib/czprob.mps.gz");
     20      status=model.readMps("../../Data/Netlib/czprob.mps.gz");
    2121    }
    2222  } else {
  • trunk/Clp/examples/testGub2.cpp

    r343 r778  
    1616  int maxFactor=100;
    1717  if (argc<2)
    18     status=model.readMps("../../Mps/Sample/p0033.mps");
     18    status=model.readMps("../../Data/Sample/p0033.mps");
    1919  else
    2020    status=model.readMps(argv[1]);
  • trunk/Clp/examples/testQP.cpp

    • Property svn:executable deleted
    r543 r778  
    2121  if (argc<2) {
    2222    CoinMpsIO  m;
    23     int status=m.readMps("../../Mps/Sample/share2qp","mps");
     23    int status=m.readMps("../../Data/Sample/share2qp","mps");
    2424    if (status) {
    2525      printf("errors on input\n");
  • trunk/Clp/examples/useVolume.cpp

    r225 r778  
    162162
    163163  if (argc<2)
    164     status=model.readMps("../../Mps/Sample/p0033.mps",true);
     164    status=model.readMps("../../Data/Sample/p0033.mps",true);
    165165  else
    166166    status=model.readMps(argv[1],true);
  • trunk/Clp/src/Clp_C_Interface.cpp

    r754 r778  
    435435}
    436436/* Sets problem name.  Must have \0 at end.  */
    437 COINLIBAPI bool COINLINKAGE
     437COINLIBAPI int COINLINKAGE
    438438Clp_setProblemName(Clp_Simplex * model, int maxNumberCharacters, char * array)
    439439{
  • trunk/Clp/src/Clp_C_Interface.h

    r754 r778  
    117117  COINLIBAPI void COINLINKAGE Clp_problemName(Clp_Simplex * model, int maxNumberCharacters, char * array);
    118118  /* Sets problem name.  Must have \0 at end.  */
    119   COINLIBAPI bool COINLINKAGE
     119  COINLIBAPI int COINLINKAGE
    120120    Clp_setProblemName(Clp_Simplex * model, int maxNumberCharacters, char * array);
    121121  /** Number of iterations */
  • trunk/Clp/src/Makefile.am

    r777 r778  
    116116include_HEADERS = \
    117117        ../inc/config_clp.h \
     118        Clp_C_Interface.h \
     119        ClpCholeskyBase.hpp \
     120        ClpCholeskyDense.hpp \
     121        ClpCholeskyWssmp.hpp \
    118122        ClpDualRowDantzig.hpp \
    119123        ClpDualRowPivot.hpp \
    120124        ClpDualRowSteepest.hpp \
     125        ClpDynamicExampleMatrix.hpp \
     126        ClpDynamicMatrix.hpp \
    121127        ClpEventHandler.hpp \
    122128        ClpFactorization.hpp \
     129        ClpGubDynamicMatrix.hpp \
     130        ClpGubMatrix.hpp \
    123131        ClpInterior.hpp \
    124132        ClpLinearObjective.hpp \
     
    136144        ClpPrimalColumnPivot.hpp \
    137145        ClpPrimalColumnSteepest.hpp \
     146        ClpQuadraticObjective.hpp \
    138147        ClpSimplex.hpp \
    139148        ClpSimplexNonlinear.hpp \
  • trunk/Clp/src/Makefile.in

    r777 r778  
    191191MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
    192192MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    193 MAINTAINER_SMALL_FALSE = @MAINTAINER_SMALL_FALSE@
    194 MAINTAINER_SMALL_TRUE = @MAINTAINER_SMALL_TRUE@
    195193MAKEINFO = @MAKEINFO@
    196194OBJEXT = @OBJEXT@
     
    203201PATH_SEPARATOR = @PATH_SEPARATOR@
    204202RANLIB = @RANLIB@
     203RPATH_FLAGS = @RPATH_FLAGS@
    205204SET_MAKE = @SET_MAKE@
    206205SHELL = @SHELL@
    207206STRIP = @STRIP@
    208207VERSION = @VERSION@
     208abs_bin_dir = @abs_bin_dir@
     209abs_include_dir = @abs_include_dir@
     210abs_lib_dir = @abs_lib_dir@
    209211ac_ct_AR = @ac_ct_AR@
    210212ac_ct_CC = @ac_ct_CC@
     
    246248mkdir_p = @mkdir_p@
    247249oldincludedir = @oldincludedir@
    248 pkg_bin_dir = @pkg_bin_dir@
    249 pkg_include_dir = @pkg_include_dir@
    250 pkg_lib_dir = @pkg_lib_dir@
    251250prefix = @prefix@
    252251program_transform_name = @program_transform_name@
     
    345344include_HEADERS = \
    346345        ../inc/config_clp.h \
     346        Clp_C_Interface.h \
     347        ClpCholeskyBase.hpp \
     348        ClpCholeskyDense.hpp \
     349        ClpCholeskyWssmp.hpp \
    347350        ClpDualRowDantzig.hpp \
    348351        ClpDualRowPivot.hpp \
    349352        ClpDualRowSteepest.hpp \
     353        ClpDynamicExampleMatrix.hpp \
     354        ClpDynamicMatrix.hpp \
    350355        ClpEventHandler.hpp \
    351356        ClpFactorization.hpp \
     357        ClpGubDynamicMatrix.hpp \
     358        ClpGubMatrix.hpp \
    352359        ClpInterior.hpp \
    353360        ClpLinearObjective.hpp \
     
    365372        ClpPrimalColumnPivot.hpp \
    366373        ClpPrimalColumnSteepest.hpp \
     374        ClpQuadraticObjective.hpp \
    367375        ClpSimplex.hpp \
    368376        ClpSimplexNonlinear.hpp \
  • trunk/Clp/test/Makefile.in

    r776 r778  
    118118MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
    119119MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    120 MAINTAINER_SMALL_FALSE = @MAINTAINER_SMALL_FALSE@
    121 MAINTAINER_SMALL_TRUE = @MAINTAINER_SMALL_TRUE@
    122120MAKEINFO = @MAKEINFO@
    123121OBJEXT = @OBJEXT@
     
    130128PATH_SEPARATOR = @PATH_SEPARATOR@
    131129RANLIB = @RANLIB@
     130RPATH_FLAGS = @RPATH_FLAGS@
    132131SET_MAKE = @SET_MAKE@
    133132SHELL = @SHELL@
    134133STRIP = @STRIP@
    135134VERSION = @VERSION@
     135abs_bin_dir = @abs_bin_dir@
     136abs_include_dir = @abs_include_dir@
     137abs_lib_dir = @abs_lib_dir@
    136138ac_ct_AR = @ac_ct_AR@
    137139ac_ct_CC = @ac_ct_CC@
     
    173175mkdir_p = @mkdir_p@
    174176oldincludedir = @oldincludedir@
    175 pkg_bin_dir = @pkg_bin_dir@
    176 pkg_include_dir = @pkg_include_dir@
    177 pkg_lib_dir = @pkg_lib_dir@
    178177prefix = @prefix@
    179178program_transform_name = @program_transform_name@
Note: See TracChangeset for help on using the changeset viewer.