Changeset 523


Ignore:
Timestamp:
Aug 20, 2007 12:05:02 AM (13 years ago)
Author:
andreasw
Message:

merging changes from Bug Squashing Party Aug 2007 to regular trunk

Location:
ThirdParty/HSL/trunk
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/Makefile.am

    r210 r523  
    1111noinst_LTLIBRARIES = libcoinhsl.la
    1212
    13 nodist_libcoinhsl_la_SOURCES =
     13nodist_libcoinhsl_la_SOURCES = dummy.c
    1414
    1515if COIN_HAS_MA27
  • ThirdParty/HSL/trunk/Makefile.in

    r213 r523  
    6060        $(srcdir)/../../BuildTools/Makemain.inc \
    6161        $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
    62         $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
    63         $(srcdir)/../../missing $(srcdir)/Makefile.am \
    64         $(srcdir)/Makefile.in $(top_srcdir)/configure
     62        $(srcdir)/../../depcomp $(srcdir)/../../install-sh \
     63        $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \
     64        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
     65        $(top_srcdir)/configure
    6566@HAVE_EXTERNALS_TRUE@am__append_5 = Externals
    6667@HAVE_EXTERNALS_TRUE@am__append_6 = .Externals-stamp
     
    8384@COIN_HAS_MA28_TRUE@    mc20ad.lo mc21ad.lo mc22ad.lo mc23ad.lo \
    8485@COIN_HAS_MA28_TRUE@    mc24ad.lo
    85 nodist_libcoinhsl_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
    86         $(am__objects_3) $(am__objects_4)
     86nodist_libcoinhsl_la_OBJECTS = dummy.lo $(am__objects_1) \
     87        $(am__objects_2) $(am__objects_3) $(am__objects_4)
    8788libcoinhsl_la_OBJECTS = $(nodist_libcoinhsl_la_OBJECTS)
    8889DEFAULT_INCLUDES = -I. -I$(srcdir)
     90depcomp = $(SHELL) $(top_srcdir)/../../depcomp
     91am__depfiles_maybe = depfiles
     92COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     93        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     94LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
     95        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     96        $(AM_CFLAGS) $(CFLAGS)
     97CCLD = $(CC)
     98LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     99        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    89100F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS)
    90101LTF77COMPILE = $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) \
     
    249260EXTRA_DIST = INSTALL.HSL $(am__append_5)
    250261noinst_LTLIBRARIES = libcoinhsl.la
    251 nodist_libcoinhsl_la_SOURCES = $(am__append_1) $(am__append_2) \
     262nodist_libcoinhsl_la_SOURCES = dummy.c $(am__append_1) $(am__append_2) \
    252263        $(am__append_3) $(am__append_4)
    253264libcoinhsl_la_LDFLAGS = $(LT_LDFLAGS)
     
    262273
    263274.SUFFIXES:
    264 .SUFFIXES: .f .lo .o .obj
     275.SUFFIXES: .c .f .lo .o .obj
    265276am--refresh:
    266277        @:
     
    313324distclean-compile:
    314325        -rm -f *.tab.c
     326
     327@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
     328
     329.c.o:
     330@am__fastdepCC_TRUE@    if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     331@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     332@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     333@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     334@am__fastdepCC_FALSE@   $(COMPILE) -c $<
     335
     336.c.obj:
     337@am__fastdepCC_TRUE@    if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
     338@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     339@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     340@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     341@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
     342
     343.c.lo:
     344@am__fastdepCC_TRUE@    if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     345@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     346@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     347@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     348@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
    315349
    316350.f.o:
     
    544578distclean: distclean-am
    545579        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
     580        -rm -rf ./$(DEPDIR)
    546581        -rm -f Makefile
    547582distclean-am: clean-am distclean-compile distclean-generic \
     
    571606        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    572607        -rm -rf $(top_srcdir)/autom4te.cache
     608        -rm -rf ./$(DEPDIR)
    573609        -rm -f Makefile
    574610maintainer-clean-am: distclean-am maintainer-clean-generic
  • ThirdParty/HSL/trunk/configure

    r443 r523  
    16821682
    16831683
     1684#turn off warnings and pedantic mode since they could make trouble on some platforms,
     1685#and we couldn't fix them anyway
     1686coin_skip_warn_fflags=yes
     1687
    16841688# Check if user wants to produce debugging code
    16851689
     
    17781782
    17791783
    1780 # Get the name of the Fortran compiler and appropriate compiler options
     1784# Get the name of the C compiler (for a dummy program)
    17811785case $build in
    17821786  *-mingw*)
     
    18001804  if test "$enable_doscompile" != no; then
    18011805     case $build in
    1802        *-cygwin*) ;;
    1803        *) { { echo "$as_me:$LINENO: error: --enable-doscompile option makes sense only under Cygwin" >&5
    1804 echo "$as_me: error: --enable-doscompile option makes sense only under Cygwin" >&2;}
     1806       *-cygwin* | *-mingw*) ;;
     1807       *) { { echo "$as_me:$LINENO: error: --enable-doscompile option makes sense only under Cygwin or MinGW" >&5
     1808echo "$as_me: error: --enable-doscompile option makes sense only under Cygwin or MinGW" >&2;}
    18051809   { (exit 1); exit 1; }; } ;;
    18061810     esac
     
    18101814fi;
    18111815 case "$enable_doscompile" in
    1812    msvc|mingw|no) ;;
     1816   mingw)
     1817     case $build in
     1818       *-mingw*) enable_doscompile=no ;;
     1819     esac
     1820     ;;
     1821   msvc|no) ;;
    18131822   yes) enable_doscompile=mingw ;;
    18141823   *) { { echo "$as_me:$LINENO: error: Invalid value $enable_doscompile for --enable-doscompile.
     
    27602769          xlc* | */xlc* | mpxlc* | */mpxlc*)
    27612770            coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    2762             coin_add_cflags="-bmaxdata:0x80000000"
     2771            coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029"
    27632772            coin_dbg_cflags="-g"
    27642773          ;;
     
    30253034
    30263035
     3036
     3037# Get the name of the Fortran compiler and appropriate compiler options
    30273038case $build in
    30283039  *-cygwin* | *-mingw*)
     
    32053216
    32063217# Provide some information about the compiler.
    3207 echo "$as_me:3207:" \
     3218echo "$as_me:3218:" \
    32083219     "checking for Fortran 77 compiler version" >&5
    32093220ac_compiler=`set X $ac_compile; echo $2`
     
    34873498          xlf* | */xlf* | mpxlf* | */mpxlf* )
    34883499            coin_opt_fflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    3489             coin_add_fflags="-bmaxdata:0x80000000"
     3500            coin_add_fflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029"
    34903501            coin_dbg_fflags="-g -C"
    34913502            ;;
     
    53425353*-*-irix6*)
    53435354  # Find out which ABI we are using.
    5344   echo '#line 5344 "configure"' > conftest.$ac_ext
     5355  echo '#line 5355 "configure"' > conftest.$ac_ext
    53455356  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    53465357  (eval $ac_compile) 2>&5
     
    77717782   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77727783   -e 's:$: $lt_compiler_flag:'`
    7773    (eval echo "\"\$as_me:7773: $lt_compile\"" >&5)
     7784   (eval echo "\"\$as_me:7784: $lt_compile\"" >&5)
    77747785   (eval "$lt_compile" 2>conftest.err)
    77757786   ac_status=$?
    77767787   cat conftest.err >&5
    7777    echo "$as_me:7777: \$? = $ac_status" >&5
     7788   echo "$as_me:7788: \$? = $ac_status" >&5
    77787789   if (exit $ac_status) && test -s "$ac_outfile"; then
    77797790     # The compiler can only warn and ignore the option if not recognized
     
    80398050   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80408051   -e 's:$: $lt_compiler_flag:'`
    8041    (eval echo "\"\$as_me:8041: $lt_compile\"" >&5)
     8052   (eval echo "\"\$as_me:8052: $lt_compile\"" >&5)
    80428053   (eval "$lt_compile" 2>conftest.err)
    80438054   ac_status=$?
    80448055   cat conftest.err >&5
    8045    echo "$as_me:8045: \$? = $ac_status" >&5
     8056   echo "$as_me:8056: \$? = $ac_status" >&5
    80468057   if (exit $ac_status) && test -s "$ac_outfile"; then
    80478058     # The compiler can only warn and ignore the option if not recognized
     
    81438154   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81448155   -e 's:$: $lt_compiler_flag:'`
    8145    (eval echo "\"\$as_me:8145: $lt_compile\"" >&5)
     8156   (eval echo "\"\$as_me:8156: $lt_compile\"" >&5)
    81468157   (eval "$lt_compile" 2>out/conftest.err)
    81478158   ac_status=$?
    81488159   cat out/conftest.err >&5
    8149    echo "$as_me:8149: \$? = $ac_status" >&5
     8160   echo "$as_me:8160: \$? = $ac_status" >&5
    81508161   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    81518162   then
     
    1048810499  lt_status=$lt_dlunknown
    1048910500  cat > conftest.$ac_ext <<EOF
    10490 #line 10490 "configure"
     10501#line 10501 "configure"
    1049110502#include "confdefs.h"
    1049210503
     
    1058810599  lt_status=$lt_dlunknown
    1058910600  cat > conftest.$ac_ext <<EOF
    10590 #line 10590 "configure"
     10601#line 10601 "configure"
    1059110602#include "confdefs.h"
    1059210603
     
    1293212943   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1293312944   -e 's:$: $lt_compiler_flag:'`
    12934    (eval echo "\"\$as_me:12934: $lt_compile\"" >&5)
     12945   (eval echo "\"\$as_me:12945: $lt_compile\"" >&5)
    1293512946   (eval "$lt_compile" 2>conftest.err)
    1293612947   ac_status=$?
    1293712948   cat conftest.err >&5
    12938    echo "$as_me:12938: \$? = $ac_status" >&5
     12949   echo "$as_me:12949: \$? = $ac_status" >&5
    1293912950   if (exit $ac_status) && test -s "$ac_outfile"; then
    1294012951     # The compiler can only warn and ignore the option if not recognized
     
    1303613047   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1303713048   -e 's:$: $lt_compiler_flag:'`
    13038    (eval echo "\"\$as_me:13038: $lt_compile\"" >&5)
     13049   (eval echo "\"\$as_me:13049: $lt_compile\"" >&5)
    1303913050   (eval "$lt_compile" 2>out/conftest.err)
    1304013051   ac_status=$?
    1304113052   cat out/conftest.err >&5
    13042    echo "$as_me:13042: \$? = $ac_status" >&5
     13053   echo "$as_me:13053: \$? = $ac_status" >&5
    1304313054   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1304413055   then
     
    1460614617   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1460714618   -e 's:$: $lt_compiler_flag:'`
    14608    (eval echo "\"\$as_me:14608: $lt_compile\"" >&5)
     14619   (eval echo "\"\$as_me:14619: $lt_compile\"" >&5)
    1460914620   (eval "$lt_compile" 2>conftest.err)
    1461014621   ac_status=$?
    1461114622   cat conftest.err >&5
    14612    echo "$as_me:14612: \$? = $ac_status" >&5
     14623   echo "$as_me:14623: \$? = $ac_status" >&5
    1461314624   if (exit $ac_status) && test -s "$ac_outfile"; then
    1461414625     # The compiler can only warn and ignore the option if not recognized
     
    1471014721   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1471114722   -e 's:$: $lt_compiler_flag:'`
    14712    (eval echo "\"\$as_me:14712: $lt_compile\"" >&5)
     14723   (eval echo "\"\$as_me:14723: $lt_compile\"" >&5)
    1471314724   (eval "$lt_compile" 2>out/conftest.err)
    1471414725   ac_status=$?
    1471514726   cat out/conftest.err >&5
    14716    echo "$as_me:14716: \$? = $ac_status" >&5
     14727   echo "$as_me:14727: \$? = $ac_status" >&5
    1471714728   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1471814729   then
     
    1691716928   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1691816929   -e 's:$: $lt_compiler_flag:'`
    16919    (eval echo "\"\$as_me:16919: $lt_compile\"" >&5)
     16930   (eval echo "\"\$as_me:16930: $lt_compile\"" >&5)
    1692016931   (eval "$lt_compile" 2>conftest.err)
    1692116932   ac_status=$?
    1692216933   cat conftest.err >&5
    16923    echo "$as_me:16923: \$? = $ac_status" >&5
     16934   echo "$as_me:16934: \$? = $ac_status" >&5
    1692416935   if (exit $ac_status) && test -s "$ac_outfile"; then
    1692516936     # The compiler can only warn and ignore the option if not recognized
     
    1718517196   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1718617197   -e 's:$: $lt_compiler_flag:'`
    17187    (eval echo "\"\$as_me:17187: $lt_compile\"" >&5)
     17198   (eval echo "\"\$as_me:17198: $lt_compile\"" >&5)
    1718817199   (eval "$lt_compile" 2>conftest.err)
    1718917200   ac_status=$?
    1719017201   cat conftest.err >&5
    17191    echo "$as_me:17191: \$? = $ac_status" >&5
     17202   echo "$as_me:17202: \$? = $ac_status" >&5
    1719217203   if (exit $ac_status) && test -s "$ac_outfile"; then
    1719317204     # The compiler can only warn and ignore the option if not recognized
     
    1728917300   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1729017301   -e 's:$: $lt_compiler_flag:'`
    17291    (eval echo "\"\$as_me:17291: $lt_compile\"" >&5)
     17302   (eval echo "\"\$as_me:17302: $lt_compile\"" >&5)
    1729217303   (eval "$lt_compile" 2>out/conftest.err)
    1729317304   ac_status=$?
    1729417305   cat out/conftest.err >&5
    17295    echo "$as_me:17295: \$? = $ac_status" >&5
     17306   echo "$as_me:17306: \$? = $ac_status" >&5
    1729617307   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1729717308   then
  • ThirdParty/HSL/trunk/configure.ac

    r425 r523  
    4242AC_CANONICAL_BUILD
    4343
     44#turn off warnings and pedantic mode since they could make trouble on some platforms,
     45#and we couldn't fix them anyway
     46coin_skip_warn_fflags=yes
     47
    4448# Check if user wants to produce debugging code
    4549AC_COIN_DEBUG_COMPILE(HSL)
     50
     51# Get the name of the C compiler (for a dummy program)
     52AC_COIN_PROG_CC
    4653
    4754# Get the name of the Fortran compiler and appropriate compiler options
Note: See TracChangeset for help on using the changeset viewer.