Changeset 766


Ignore:
Timestamp:
May 15, 2006 3:21:26 PM (13 years ago)
Author:
andreasw
Message:

added --enable-gnu-packages flag; third party solvers need to be provided with link flags

Location:
trunk/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.am

    r754 r766  
    6060        if test -r test/Makefile; then cd test; make distclean; fi
    6161
    62 .PHONY: test unitTest
     62.PHONY: test unitTest clean-test distclean-test
    6363
    6464########################################################################
     
    7373uninstall-local:
    7474        rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
     75
     76########################################################################
     77#                         Maintainer Stuff                             #
     78########################################################################
     79
     80# Files that are generated and should be cleaned with make distclean
     81DISTCLEANFILES =
     82
     83include ../BuildTools/Makemain.inc
  • trunk/Clp/Makefile.in

    r761 r766  
    2020
    2121# Author:  Andreas Waechter           IBM    2006-04-13
     22
     23# Copyright (C) 2006 International Business Machines and others.
     24# All Rights Reserved.
     25# This file is distributed under the Common Public License.
     26
     27# Author:  Andreas Waechter           IBM    2006-04-13
     28
     29########################################################################
     30#                         Maintainer Stuff                             #
     31########################################################################
    2232srcdir = @srcdir@
    2333top_srcdir = @top_srcdir@
     
    4757# included in the tarball
    4858@ALWAYS_FALSE@am__append_1 = test
    49 DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \
     59DIST_COMMON = README $(am__configure_deps) \
     60        $(srcdir)/../BuildTools/Makemain.inc $(srcdir)/../config.guess \
    5061        $(srcdir)/../config.sub $(srcdir)/../install-sh \
    5162        $(srcdir)/../ltmain.sh $(srcdir)/../missing \
     
    5364        $(srcdir)/clp_addlibs.txt.in $(top_srcdir)/configure \
    5465        $(top_srcdir)/inc/config_clp.h.in AUTHORS INSTALL
     66@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@am__append_2 = .Externals-stamp
     67@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@am__append_3 = Externals
    5568subdir = .
    5669ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    223236
    224237# Here we need include all files that are not mentioned in other Makefiles
    225 EXTRA_DIST = \
    226         doc/authors.xml \
    227         doc/basicmodelclasses.xml \
    228         doc/clpexe.xml \
    229         doc/clpuserguide.xml \
    230         doc/doxygen.xml \
    231         doc/faqcontent.xml \
    232         doc/faq.xml \
    233         doc/intro.xml \
    234         doc/legal.xml \
    235         doc/messages.xml \
    236         doc/moresamples.xml \
    237         doc/notsobasic.xml \
    238         doc/revhist.xml \
    239         doc/Howto/docbook4clp.xml
    240 
     238EXTRA_DIST = doc/authors.xml doc/basicmodelclasses.xml doc/clpexe.xml \
     239        doc/clpuserguide.xml doc/doxygen.xml doc/faqcontent.xml \
     240        doc/faq.xml doc/intro.xml doc/legal.xml doc/messages.xml \
     241        doc/moresamples.xml doc/notsobasic.xml doc/revhist.xml \
     242        doc/Howto/docbook4clp.xml $(am__append_3)
    241243
    242244########################################################################
     
    244246########################################################################
    245247addlibsfile = clp_addlibs.txt
     248
     249########################################################################
     250#                         Maintainer Stuff                             #
     251########################################################################
     252
     253# Files that are generated and should be cleaned with make distclean
     254DISTCLEANFILES = $(am__append_2)
    246255all: all-recursive
    247256
     
    249258am--refresh:
    250259        @:
    251 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
     260$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../BuildTools/Makemain.inc $(am__configure_deps)
    252261        @for dep in $?; do \
    253262          case '$(am__configure_deps)' in \
     
    445454        $(am__remove_distdir)
    446455        mkdir $(distdir)
    447         $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/doc $(distdir)/doc/Howto $(distdir)/inc
     456        $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/inc
    448457        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    449458        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    609618distclean-generic:
    610619        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     620        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
    611621
    612622maintainer-clean-generic:
     
    698708        if test -r test/Makefile; then cd test; make distclean; fi
    699709
    700 .PHONY: test unitTest
     710.PHONY: test unitTest clean-test distclean-test
    701711
    702712install-exec-local:
     
    705715uninstall-local:
    706716        rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
     717
     718# Make sure acinclude is using most recent coin.m4
     719@MAINTAINER_MODE_TRUE@$(srcdir)/acinclude.m4: $(BUILDTOOLSDIR)/coin.m4
     720@MAINTAINER_MODE_TRUE@  cat $(LIBTOOLM4) $< > $@
     721
     722# Make sure the autotools scripts are up to date
     723@MAINTAINER_MODE_TRUE@$(AUX_DIR)/install-sh: $(BUILDTOOLSDIR)/install-sh
     724@MAINTAINER_MODE_TRUE@  cp $< $@
     725
     726@MAINTAINER_MODE_TRUE@$(AUX_DIR)/missing: $(BUILDTOOLSDIR)/missing
     727@MAINTAINER_MODE_TRUE@  cp $< $@
     728
     729@MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/config.guess: $(BUILDTOOLSDIR)/config.guess
     730@MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
     731
     732@MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/config.sub: $(BUILDTOOLSDIR)/config.sub
     733@MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
     734
     735@MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/depcomp: $(BUILDTOOLSDIR)/depcomp
     736@MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
     737
     738@MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/ltmain.sh: $(BUILDTOOLSDIR)/ltmain.sh
     739@MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
     740
     741# Take care of updating externals (if Externals file exists)
     742@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Externals-stamp
     743
     744@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Externals-stamp: $(srcdir)/Externals
     745@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn propset svn:externals -F Externals .
     746@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
     747
     748@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     749@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
    707750# Tell versions [3.59,3.63) of GNU make to not export all variables.
    708751# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/Clp/configure

    r765 r766  
    10521052                          optimize for fast installation [default=yes]
    10531053  --disable-libtool-lock  avoid locking (might break parallel builds)
     1054  --enable-gnu-packages   compile with GNU packages (disabled by default)
    10541055
    10551056Optional Packages:
     
    16151616# retrieved by svn if they are not there yet.
    16161617# Initialize the ADDLIBS variable (a number of library require -lm)
    1617 ADDLIBS="-lm"
     1618ADDLIBS="" #"-lm"
    16181619
    16191620
     
    44774478*-*-irix6*)
    44784479  # Find out which ABI we are using.
    4479   echo '#line 4479 "configure"' > conftest.$ac_ext
     4480  echo '#line 4480 "configure"' > conftest.$ac_ext
    44804481  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    44814482  (eval $ac_compile) 2>&5
     
    56115612
    56125613# Provide some information about the compiler.
    5613 echo "$as_me:5613:" \
     5614echo "$as_me:5614:" \
    56145615     "checking for Fortran 77 compiler version" >&5
    56155616ac_compiler=`set X $ac_compile; echo $2`
     
    66786679   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    66796680   -e 's:$: $lt_compiler_flag:'`
    6680    (eval echo "\"\$as_me:6680: $lt_compile\"" >&5)
     6681   (eval echo "\"\$as_me:6681: $lt_compile\"" >&5)
    66816682   (eval "$lt_compile" 2>conftest.err)
    66826683   ac_status=$?
    66836684   cat conftest.err >&5
    6684    echo "$as_me:6684: \$? = $ac_status" >&5
     6685   echo "$as_me:6685: \$? = $ac_status" >&5
    66856686   if (exit $ac_status) && test -s "$ac_outfile"; then
    66866687     # The compiler can only warn and ignore the option if not recognized
     
    69466947   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    69476948   -e 's:$: $lt_compiler_flag:'`
    6948    (eval echo "\"\$as_me:6948: $lt_compile\"" >&5)
     6949   (eval echo "\"\$as_me:6949: $lt_compile\"" >&5)
    69496950   (eval "$lt_compile" 2>conftest.err)
    69506951   ac_status=$?
    69516952   cat conftest.err >&5
    6952    echo "$as_me:6952: \$? = $ac_status" >&5
     6953   echo "$as_me:6953: \$? = $ac_status" >&5
    69536954   if (exit $ac_status) && test -s "$ac_outfile"; then
    69546955     # The compiler can only warn and ignore the option if not recognized
     
    70507051   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    70517052   -e 's:$: $lt_compiler_flag:'`
    7052    (eval echo "\"\$as_me:7052: $lt_compile\"" >&5)
     7053   (eval echo "\"\$as_me:7053: $lt_compile\"" >&5)
    70537054   (eval "$lt_compile" 2>out/conftest.err)
    70547055   ac_status=$?
    70557056   cat out/conftest.err >&5
    7056    echo "$as_me:7056: \$? = $ac_status" >&5
     7057   echo "$as_me:7057: \$? = $ac_status" >&5
    70577058   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    70587059   then
     
    93959396  lt_status=$lt_dlunknown
    93969397  cat > conftest.$ac_ext <<EOF
    9397 #line 9397 "configure"
     9398#line 9398 "configure"
    93989399#include "confdefs.h"
    93999400
     
    94959496  lt_status=$lt_dlunknown
    94969497  cat > conftest.$ac_ext <<EOF
    9497 #line 9497 "configure"
     9498#line 9498 "configure"
    94989499#include "confdefs.h"
    94999500
     
    1183911840   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1184011841   -e 's:$: $lt_compiler_flag:'`
    11841    (eval echo "\"\$as_me:11841: $lt_compile\"" >&5)
     11842   (eval echo "\"\$as_me:11842: $lt_compile\"" >&5)
    1184211843   (eval "$lt_compile" 2>conftest.err)
    1184311844   ac_status=$?
    1184411845   cat conftest.err >&5
    11845    echo "$as_me:11845: \$? = $ac_status" >&5
     11846   echo "$as_me:11846: \$? = $ac_status" >&5
    1184611847   if (exit $ac_status) && test -s "$ac_outfile"; then
    1184711848     # The compiler can only warn and ignore the option if not recognized
     
    1194311944   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1194411945   -e 's:$: $lt_compiler_flag:'`
    11945    (eval echo "\"\$as_me:11945: $lt_compile\"" >&5)
     11946   (eval echo "\"\$as_me:11946: $lt_compile\"" >&5)
    1194611947   (eval "$lt_compile" 2>out/conftest.err)
    1194711948   ac_status=$?
    1194811949   cat out/conftest.err >&5
    11949    echo "$as_me:11949: \$? = $ac_status" >&5
     11950   echo "$as_me:11950: \$? = $ac_status" >&5
    1195011951   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1195111952   then
     
    1351313514   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1351413515   -e 's:$: $lt_compiler_flag:'`
    13515    (eval echo "\"\$as_me:13515: $lt_compile\"" >&5)
     13516   (eval echo "\"\$as_me:13516: $lt_compile\"" >&5)
    1351613517   (eval "$lt_compile" 2>conftest.err)
    1351713518   ac_status=$?
    1351813519   cat conftest.err >&5
    13519    echo "$as_me:13519: \$? = $ac_status" >&5
     13520   echo "$as_me:13520: \$? = $ac_status" >&5
    1352013521   if (exit $ac_status) && test -s "$ac_outfile"; then
    1352113522     # The compiler can only warn and ignore the option if not recognized
     
    1361713618   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1361813619   -e 's:$: $lt_compiler_flag:'`
    13619    (eval echo "\"\$as_me:13619: $lt_compile\"" >&5)
     13620   (eval echo "\"\$as_me:13620: $lt_compile\"" >&5)
    1362013621   (eval "$lt_compile" 2>out/conftest.err)
    1362113622   ac_status=$?
    1362213623   cat out/conftest.err >&5
    13623    echo "$as_me:13623: \$? = $ac_status" >&5
     13624   echo "$as_me:13624: \$? = $ac_status" >&5
    1362413625   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1362513626   then
     
    1582415825   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1582515826   -e 's:$: $lt_compiler_flag:'`
    15826    (eval echo "\"\$as_me:15826: $lt_compile\"" >&5)
     15827   (eval echo "\"\$as_me:15827: $lt_compile\"" >&5)
    1582715828   (eval "$lt_compile" 2>conftest.err)
    1582815829   ac_status=$?
    1582915830   cat conftest.err >&5
    15830    echo "$as_me:15830: \$? = $ac_status" >&5
     15831   echo "$as_me:15831: \$? = $ac_status" >&5
    1583115832   if (exit $ac_status) && test -s "$ac_outfile"; then
    1583215833     # The compiler can only warn and ignore the option if not recognized
     
    1609216093   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1609316094   -e 's:$: $lt_compiler_flag:'`
    16094    (eval echo "\"\$as_me:16094: $lt_compile\"" >&5)
     16095   (eval echo "\"\$as_me:16095: $lt_compile\"" >&5)
    1609516096   (eval "$lt_compile" 2>conftest.err)
    1609616097   ac_status=$?
    1609716098   cat conftest.err >&5
    16098    echo "$as_me:16098: \$? = $ac_status" >&5
     16099   echo "$as_me:16099: \$? = $ac_status" >&5
    1609916100   if (exit $ac_status) && test -s "$ac_outfile"; then
    1610016101     # The compiler can only warn and ignore the option if not recognized
     
    1619616197   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1619716198   -e 's:$: $lt_compiler_flag:'`
    16198    (eval echo "\"\$as_me:16198: $lt_compile\"" >&5)
     16199   (eval echo "\"\$as_me:16199: $lt_compile\"" >&5)
    1619916200   (eval "$lt_compile" 2>out/conftest.err)
    1620016201   ac_status=$?
    1620116202   cat out/conftest.err >&5
    16202    echo "$as_me:16202: \$? = $ac_status" >&5
     16203   echo "$as_me:16203: \$? = $ac_status" >&5
    1620316204   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1620416205   then
     
    1962019621#############################################################################
    1962119622
    19622 
    19623 
    19624 
    19625 
    19626 
    19627 coin_has_readline=no
    19628 if test x"#include <stdio.h>" = x; then
     19623# Check whether --enable-gnu-packages or --disable-gnu-packages was given.
     19624if test "${enable_gnu_packages+set}" = set; then
     19625  enableval="$enable_gnu_packages"
     19626  coin_enable_gnu=$enableval
     19627else
     19628  coin_enable_gnu=no
     19629fi;
     19630
     19631
     19632
     19633
     19634
     19635
     19636
     19637if test $coin_enable_gnu = yes; then
     19638  coin_has_readline=no
     19639  if test x"#include <stdio.h>" = x; then
    1962919640  hdr="#include <readline/readline.h>"
    1963019641else
     
    1969419705
    1969519706
    19696 coin_save_LIBS="$LIBS"
    19697 LIBS=
    19698 # First we check if tputs and friends are available
    19699 if test $coin_has_readline = yes; then
    19700   echo "$as_me:$LINENO: checking for library containing tputs" >&5
     19707  coin_save_LIBS="$LIBS"
     19708  LIBS=
     19709  # First we check if tputs and friends are available
     19710  if test $coin_has_readline = yes; then
     19711    echo "$as_me:$LINENO: checking for library containing tputs" >&5
    1970119712echo $ECHO_N "checking for library containing tputs... $ECHO_C" >&6
    1970219713if test "${ac_cv_search_tputs+set}" = set; then
     
    1982619837fi
    1982719838
    19828 fi
    19829 
    19830 # Now we check for readline
    19831 if test $coin_has_readline = yes; then
    19832   echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
     19839  fi
     19840
     19841  # Now we check for readline
     19842  if test $coin_has_readline = yes; then
     19843    echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
    1983319844echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
    1983419845if test "${ac_cv_lib_readline_readline+set}" = set; then
     
    1990019911fi
    1990119912
    19902 fi
    19903 
    19904 if test $coin_has_readline = yes; then
     19913  fi
     19914
     19915  if test $coin_has_readline = yes; then
    1990519916
    1990619917cat >>confdefs.h <<\_ACEOF
     
    1990819919_ACEOF
    1990919920
    19910 fi
    19911 
    19912 LIBS="$coin_save_LIBS"
     19921  fi
     19922
     19923  LIBS="$coin_save_LIBS"
     19924fi
    1991319925
    1991419926
Note: See TracChangeset for help on using the changeset viewer.