Changeset 845


Ignore:
Timestamp:
Dec 27, 2007 10:04:53 PM (11 years ago)
Author:
andreasw
Message:

reran autotools; made COIN-wide changes regarding installation of header files and documentation files

Location:
stable/2.0/Cbc
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • stable/2.0/Cbc/Makefile.am

    r640 r845  
    115115addlibsfile = cbc_addlibs.txt
    116116
    117 install-exec-local:
     117install-exec-local: install-doc
    118118        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
    119119
    120 uninstall-local:
     120uninstall-local: uninstall-doc
    121121        rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
    122122

  • stable/2.0/Cbc/Makefile.in

    r710 r845  
    2828
    2929########################################################################
    30 #                         Maintainer Stuff                             #
     30#                    Documentation installation                        #
    3131########################################################################
    3232srcdir = @srcdir@
    … …  
    297297sbindir = @sbindir@
    298298sharedstatedir = @sharedstatedir@
     299sol_cc_compiler = @sol_cc_compiler@
    299300sysconfdir = @sysconfdir@
    300301target_alias = @target_alias@
    … …  
    348349# Files that are generated and should be cleaned with make distclean
    349350DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
     351DocFiles = README AUTHORS LICENSE
     352DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME)
    350353all: all-recursive
    351354
    … …  
    807810.PHONY: test unitTest
    808811
    809 install-exec-local:
     812install-exec-local: install-doc
    810813        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
    811814
    812 uninstall-local:
     815uninstall-local: uninstall-doc
    813816        rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
     817
     818install-doc:
     819        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
     820        for file in $(DocFiles); do \
     821          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
     822          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
     823        done
     824
     825uninstall-doc:
     826        for file in $(DocFiles); do \
     827          rm -f "$(DESTDIR)$(DocInstallDir)/$$file"; \
     828        done
     829
     830########################################################################
     831#                         Maintainer Stuff                             #
     832########################################################################
    814833
    815834# Make sure acinclude is using most recent coin.m4
    … …  
    845864@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
    846865@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
     866
     867.PHONY: install-doc uninstall-doc update-externals
    847868# Tell versions [3.59,3.63) of GNU make to not export all variables.
    848869# Otherwise a system limit (for SysV at least) may be exceeded.

  • stable/2.0/Cbc/configure

    r831 r845  
    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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX 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 have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_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 ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS 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 VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_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 GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE LIBEXT VPATH_DISTCLEANFILES 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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX 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 have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_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 ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS 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 VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_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 GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
    … …  
    19101910
    19111911save_cflags="$CFLAGS"
    1912 # For sparc-sun-solaris, promote Studio/Workshop compiler to front of list.
    1913 # ToDo: If Studio/Workshop cc is not present, we may find /usr/ucb/cc, which
    1914 # is likely to be a non-functional shell. But many installations will have
    1915 # both cc and gcc, so promoting gcc isn't good either. How to test reliably?
     1912
     1913# For *-*-solaris*, promote Studio/Workshop cc compiler to front of list.
     1914# Depending on the user's PATH, when Studio/Workshop cc is not present we may
     1915# find /usr/ucb/cc, which is almost certainly not a good choice for the C
     1916# compiler. In this case, put cc after gcc.
     1917
    19161918case $build in
    19171919  *-cygwin* | *-mingw*)
    … …  
    19211923               comps="gcc cl"
    19221924             fi ;;
    1923   sparc-sun-solaris*)
    1924              comps="cc xlc gcc pgcc icc" ;;
     1925  *-*-solaris*)
     1926             # Extract the first word of "cc", so it can be a program name with args.
     1927set dummy cc; ac_word=$2
     1928echo "$as_me:$LINENO: checking for $ac_word" >&5
     1929echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     1930if test "${ac_cv_prog_sol_cc_compiler+set}" = set; then
     1931  echo $ECHO_N "(cached) $ECHO_C" >&6
     1932else
     1933  if test -n "$sol_cc_compiler"; then
     1934  ac_cv_prog_sol_cc_compiler="$sol_cc_compiler" # Let the user override the test.
     1935else
     1936  ac_prog_rejected=no
     1937as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     1938for as_dir in $PATH
     1939do
     1940  IFS=$as_save_IFS
     1941  test -z "$as_dir" && as_dir=.
     1942  for ac_exec_ext in '' $ac_executable_extensions; do
     1943  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1944    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
     1945       ac_prog_rejected=yes
     1946       continue
     1947     fi
     1948    ac_cv_prog_sol_cc_compiler="cc"
     1949    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     1950    break 2
     1951  fi
     1952done
     1953done
     1954
     1955if test $ac_prog_rejected = yes; then
     1956  # We found a bogon in the path, so make sure we never use it.
     1957  set dummy $ac_cv_prog_sol_cc_compiler
     1958  shift
     1959  if test $# != 0; then
     1960    # We chose a different compiler from the bogus one.
     1961    # However, it has the same basename, so the bogon will be chosen
     1962    # first if we set sol_cc_compiler to just the basename; use the full file name.
     1963    shift
     1964    ac_cv_prog_sol_cc_compiler="$as_dir/$ac_word${1+' '}$@"
     1965  fi
     1966fi
     1967fi
     1968fi
     1969sol_cc_compiler=$ac_cv_prog_sol_cc_compiler
     1970if test -n "$sol_cc_compiler"; then
     1971  echo "$as_me:$LINENO: result: $sol_cc_compiler" >&5
     1972echo "${ECHO_T}$sol_cc_compiler" >&6
     1973else
     1974  echo "$as_me:$LINENO: result: no" >&5
     1975echo "${ECHO_T}no" >&6
     1976fi
     1977
     1978             if test "$sol_cc_compiler" = "cc" ; then
     1979               comps="cc xlc gcc pgcc icc"
     1980             else
     1981               comps="xlc gcc pgcc icc cc"
     1982             fi
     1983             ;;
    19251984  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    19261985  *)         comps="xlc_r xlc cc gcc pgcc icc" ;;
    … …  
    28242883        coin_dbg_cflags="-g"
    28252884        ;;
    2826       *-sun-*)
     2885      *-*-solaris*)
    28272886        coin_opt_cflags="-xO4"
    28282887        coin_dbg_cflags="-g"
    … …  
    30973156
    30983157save_cxxflags="$CXXFLAGS"
    3099 # For sparc-sun-solaris, promote Studio/Workshop compiler to front of list.
     3158# For *-*-solaris*, promote Studio/Workshop compiler to front of list.
    31003159case $build in
    31013160  *-cygwin* | *-mingw*)
    … …  
    31053164               comps="g++ cl"
    31063165             fi ;;
    3107   sparc-sun-solaris*)
     3166  *-*-solaris*)
    31083167             comps="CC xlC aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    31093168  *-darwin*) comps="g++ c++ CC" ;;
    … …  
    36693728        esac
    36703729        ;;
    3671       *-sun-*)
     3730      *-*-solaris*)
    36723731          coin_opt_cxxflags="-O4"
    36733732          coin_dbg_cxxflags="-g"
    … …  
    39323991# START
    39333992
    3934 # On Cygwin, building DLLs doesn't work
     3993# On Cygwin and AIX, building DLLs doesn't work
    39353994case $build in
    39363995  *-cygwin*)
    39373996    coin_disable_shared=yes
    39383997    platform=Cygwin
     3998  ;;
     3999  *-aix*)
     4000    coin_disable_shared=yes
     4001    platform=AIX
    39394002  ;;
    39404003  *-mingw*)
    … …  
    56535716*-*-irix6*)
    56545717  # Find out which ABI we are using.
    5655   echo '#line 5655 "configure"' > conftest.$ac_ext
     5718  echo '#line 5718 "configure"' > conftest.$ac_ext
    56565719  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    56575720  (eval $ac_compile) 2>&5
    … …  
    67876850
    67886851# Provide some information about the compiler.
    6789 echo "$as_me:6789:" \
     6852echo "$as_me:6852:" \
    67906853     "checking for Fortran 77 compiler version" >&5
    67916854ac_compiler=`set X $ac_compile; echo $2`
    … …  
    78547917   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78557918   -e 's:$: $lt_compiler_flag:'`
    7856    (eval echo "\"\$as_me:7856: $lt_compile\"" >&5)
     7919   (eval echo "\"\$as_me:7919: $lt_compile\"" >&5)
    78577920   (eval "$lt_compile" 2>conftest.err)
    78587921   ac_status=$?
    78597922   cat conftest.err >&5
    7860    echo "$as_me:7860: \$? = $ac_status" >&5
     7923   echo "$as_me:7923: \$? = $ac_status" >&5
    78617924   if (exit $ac_status) && test -s "$ac_outfile"; then
    78627925     # The compiler can only warn and ignore the option if not recognized
    … …  
    81228185   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81238186   -e 's:$: $lt_compiler_flag:'`
    8124    (eval echo "\"\$as_me:8124: $lt_compile\"" >&5)
     8187   (eval echo "\"\$as_me:8187: $lt_compile\"" >&5)
    81258188   (eval "$lt_compile" 2>conftest.err)
    81268189   ac_status=$?
    81278190   cat conftest.err >&5
    8128    echo "$as_me:8128: \$? = $ac_status" >&5
     8191   echo "$as_me:8191: \$? = $ac_status" >&5
    81298192   if (exit $ac_status) && test -s "$ac_outfile"; then
    81308193     # The compiler can only warn and ignore the option if not recognized
    … …  
    82268289   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82278290   -e 's:$: $lt_compiler_flag:'`
    8228    (eval echo "\"\$as_me:8228: $lt_compile\"" >&5)
     8291   (eval echo "\"\$as_me:8291: $lt_compile\"" >&5)
    82298292   (eval "$lt_compile" 2>out/conftest.err)
    82308293   ac_status=$?
    82318294   cat out/conftest.err >&5
    8232    echo "$as_me:8232: \$? = $ac_status" >&5
     8295   echo "$as_me:8295: \$? = $ac_status" >&5
    82338296   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    82348297   then
    … …  
    1057110634  lt_status=$lt_dlunknown
    1057210635  cat > conftest.$ac_ext <<EOF
    10573 #line 10573 "configure"
     10636#line 10636 "configure"
    1057410637#include "confdefs.h"
    1057510638
    … …  
    1067110734  lt_status=$lt_dlunknown
    1067210735  cat > conftest.$ac_ext <<EOF
    10673 #line 10673 "configure"
     10736#line 10736 "configure"
    1067410737#include "confdefs.h"
    1067510738
    … …  
    1301513078   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1301613079   -e 's:$: $lt_compiler_flag:'`
    13017    (eval echo "\"\$as_me:13017: $lt_compile\"" >&5)
     13080   (eval echo "\"\$as_me:13080: $lt_compile\"" >&5)
    1301813081   (eval "$lt_compile" 2>conftest.err)
    1301913082   ac_status=$?
    1302013083   cat conftest.err >&5
    13021    echo "$as_me:13021: \$? = $ac_status" >&5
     13084   echo "$as_me:13084: \$? = $ac_status" >&5
    1302213085   if (exit $ac_status) && test -s "$ac_outfile"; then
    1302313086     # The compiler can only warn and ignore the option if not recognized
    … …  
    1311913182   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1312013183   -e 's:$: $lt_compiler_flag:'`
    13121    (eval echo "\"\$as_me:13121: $lt_compile\"" >&5)
     13184   (eval echo "\"\$as_me:13184: $lt_compile\"" >&5)
    1312213185   (eval "$lt_compile" 2>out/conftest.err)
    1312313186   ac_status=$?
    1312413187   cat out/conftest.err >&5
    13125    echo "$as_me:13125: \$? = $ac_status" >&5
     13188   echo "$as_me:13188: \$? = $ac_status" >&5
    1312613189   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1312713190   then
    … …  
    1468914752   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1469014753   -e 's:$: $lt_compiler_flag:'`
    14691    (eval echo "\"\$as_me:14691: $lt_compile\"" >&5)
     14754   (eval echo "\"\$as_me:14754: $lt_compile\"" >&5)
    1469214755   (eval "$lt_compile" 2>conftest.err)
    1469314756   ac_status=$?
    1469414757   cat conftest.err >&5
    14695    echo "$as_me:14695: \$? = $ac_status" >&5
     14758   echo "$as_me:14758: \$? = $ac_status" >&5
    1469614759   if (exit $ac_status) && test -s "$ac_outfile"; then
    1469714760     # The compiler can only warn and ignore the option if not recognized
    … …  
    1479314856   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1479414857   -e 's:$: $lt_compiler_flag:'`
    14795    (eval echo "\"\$as_me:14795: $lt_compile\"" >&5)
     14858   (eval echo "\"\$as_me:14858: $lt_compile\"" >&5)
    1479614859   (eval "$lt_compile" 2>out/conftest.err)
    1479714860   ac_status=$?
    1479814861   cat out/conftest.err >&5
    14799    echo "$as_me:14799: \$? = $ac_status" >&5
     14862   echo "$as_me:14862: \$? = $ac_status" >&5
    1480014863   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1480114864   then
    … …  
    1700017063   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1700117064   -e 's:$: $lt_compiler_flag:'`
    17002    (eval echo "\"\$as_me:17002: $lt_compile\"" >&5)
     17065   (eval echo "\"\$as_me:17065: $lt_compile\"" >&5)
    1700317066   (eval "$lt_compile" 2>conftest.err)
    1700417067   ac_status=$?
    1700517068   cat conftest.err >&5
    17006    echo "$as_me:17006: \$? = $ac_status" >&5
     17069   echo "$as_me:17069: \$? = $ac_status" >&5
    1700717070   if (exit $ac_status) && test -s "$ac_outfile"; then
    1700817071     # The compiler can only warn and ignore the option if not recognized
    … …  
    1726817331   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1726917332   -e 's:$: $lt_compiler_flag:'`
    17270    (eval echo "\"\$as_me:17270: $lt_compile\"" >&5)
     17333   (eval echo "\"\$as_me:17333: $lt_compile\"" >&5)
    1727117334   (eval "$lt_compile" 2>conftest.err)
    1727217335   ac_status=$?
    1727317336   cat conftest.err >&5
    17274    echo "$as_me:17274: \$? = $ac_status" >&5
     17337   echo "$as_me:17337: \$? = $ac_status" >&5
    1727517338   if (exit $ac_status) && test -s "$ac_outfile"; then
    1727617339     # The compiler can only warn and ignore the option if not recognized
    … …  
    1737217435   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1737317436   -e 's:$: $lt_compiler_flag:'`
    17374    (eval echo "\"\$as_me:17374: $lt_compile\"" >&5)
     17437   (eval echo "\"\$as_me:17437: $lt_compile\"" >&5)
    1737517438   (eval "$lt_compile" 2>out/conftest.err)
    1737617439   ac_status=$?
    1737717440   cat out/conftest.err >&5
    17378    echo "$as_me:17378: \$? = $ac_status" >&5
     17441   echo "$as_me:17441: \$? = $ac_status" >&5
    1737917442   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1738017443   then
    … …  
    2005820121
    2005920122
    20060 # Fix bugs in libtool script for Windows native compilation:
    20061 # - cygpath is not correctly quoted in fix_srcfile_path
    20062 # - paths generated for .lib files is not run through cygpath -w
    20063 
    20064 
    20065 # - lib includes subdirectory information; we want to replace
    20066 #
    20067 # old_archive_cmds="lib /OUT:\$oldlib\$oldobjs\$old_deplibs"
    20068 #
    20069 # by
    20070 #
    20071 # old_archive_cmds="echo \$oldlib | grep .libs >/dev/null; if test \$? = 0; then cd .libs; lib /OUT:\`echo \$oldlib\$oldobjs\$old_deplibs | sed -e s@\.libs/@@g\`; cd .. ; else lib /OUT:\$oldlib\$oldobjs\$old_deplibs ; fi"
    20072 #
    20073 #          -e 's%old_archive_cmds="lib /OUT:\\\$oldlib\\\$oldobjs\\\$old_deplibs"%old_archive_cmds="echo \\\$oldlib \| grep .libs >/dev/null; if test \\\$? = 0; then cd .libs; lib /OUT:\\\`echo \\\$oldlib\\\$oldobjs\\\$old_deplibs \| sed -e s@\\.libs/@@g\\\`; cd .. ; else lib /OUT:\\\$oldlib\\\$oldobjs\\\$old_deplibs; fi"%' \
    20074 
    20075 # The following was a hack for chaniing @BACKSLASH to \
    20076 #          -e 'sYcompile_command=`\$echo "X\$compile_command" | \$Xsed -e '"'"'s%@OUTPUT@%'"'"'"\$output"'"'"'%g'"'"'`Ycompile_command=`\$echo "X\$compile_command" | \$Xsed -e '"'"'s%@OUTPUT@%'"'"'"\$output"'"'"'%g'"'"' | \$Xsed -e '"'"'s%@BACKSLASH@%\\\\\\\\\\\\\\\\%g'"'"'`Y' \
    20077 
    20078   # Correct cygpath for minGW (ToDo!)
    2007920123  { echo "$as_me:$LINENO: Build is \"$build\"." >&5
    2008020124echo "$as_me: Build is \"$build\"." >&6;}
    … …  
    2008820132
    2008920133  case $build in
     20134    # Here we need to check if -m32 is specified.  If so, we need to correct
     20135    # sys_lib_search_path_spec
    2009020136    *x86_64-*)
    20091 # Here we need to check if -m32 is specified.  If so, we need to correct sys_lib_search_path_spec
    2009220137      if test "$GCC" = yes && (echo $CXXFLAGS $CFLAGS $FFLAGS | $EGREP 'm32' >& /dev/null); then
    2009320138        { echo "$as_me:$LINENO: Applying patches to libtool for 32bit compilation" >&5
    … …  
    2009820143      fi
    2009920144      ;;
     20145
     20146    *-solaris*)
     20147       if test "$GCC" = yes && \
     20148     (echo $CXXFLAGS $CFLAGS $FFLAGS | $EGREP 'm64' >/dev/null 2>&1) ; then
     20149    hdwisa=`isainfo | sed -e 's/\([^ ]*\) .*$/\1/'`
     20150    if `$EGREP 'sys_lib_search_path_spec=' libtool | $EGREP -v $hdwisa >/dev/null 2>&1` ; then
     20151      { echo "$as_me:$LINENO: Applying patches to libtool for 64-bit GCC compilation" >&5
     20152echo "$as_me: Applying patches to libtool for 64-bit GCC compilation" >&6;}
     20153      fixlibtmp=`$CC -m64 -print-search-dirs | $EGREP '^libraries:'`
     20154      fixlibtmp=`echo $fixlibtmp | sed -e 's/libraries: =//' -e 's/:/ /g'`
     20155      if `echo "$fixlibtmp" | $EGREP -v $hdwisa  >/dev/null 2>&1` ; then
     20156        # AC_MSG_NOTICE(Compensating for broken gcc)
     20157        for lib in $fixlibtmp ; do
     20158          if test -d "${lib}${hdwisa}" ; then
     20159            syslibpath64="$syslibpath64 ${lib}${hdwisa}/"
     20160          fi
     20161        done
     20162        syslibpath64="${syslibpath64} ${fixlibtmp}"
     20163      else
     20164        syslibpath64="$fixlibtmp"
     20165      fi
     20166      sed -e 's|sys_lib_search_path_spec=".*"|sys_lib_search_path_spec="'"$syslibpath64"'"|' libtool > conftest.bla
     20167      mv conftest.bla libtool
     20168      chmod 755 libtool
     20169    fi
     20170    # AC_MSG_NOTICE(Result is )
     20171    # $EGREP 'sys_lib_search_path_spec=' libtool
     20172  fi
     20173      ;;
     20174    # Cygwin. Ah, cygwin. Too big and ugly to inline; see the macro.
    2010020175    *-cygwin* | *-mingw*)
    20101     case "$CXX" in
    20102       cl* | */cl* | CL* | */CL*)
    20103         { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
     20176       case "$CXX" in
     20177    cl* | */cl* | CL* | */CL*)
     20178      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    2010420179echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
    20105         sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    20106             -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    20107             -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    20108             -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    20109             -e 's%lib /OUT:%lib -OUT:%' \
    20110             -e "s%cygpath -w%$CYGPATH_W%" \
    20111             -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    20112             -e 's/$AR t/lib -nologo -list/' \
    20113             -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    20114             -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
    20115             -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    20116         libtool > conftest.bla
    20117 
    20118         mv conftest.bla libtool
    20119         chmod 755 libtool
    20120         ;;
    20121       *)
    20122         { echo "$as_me:$LINENO: Applying patches to libtool for GNU compiler" >&5
     20180      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     20181          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     20182          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     20183          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     20184          -e 's%lib /OUT:%lib -OUT:%' \
     20185          -e "s%cygpath -w%$CYGPATH_W%" \
     20186          -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     20187          -e 's/$AR t/lib -nologo -list/' \
     20188          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     20189          -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
     20190          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
     20191      libtool > conftest.bla
     20192
     20193      mv conftest.bla libtool
     20194      chmod 755 libtool
     20195      ;;
     20196    *)
     20197      { echo "$as_me:$LINENO: Applying patches to libtool for GNU compiler" >&5
    2012320198echo "$as_me: Applying patches to libtool for GNU compiler" >&6;}
    20124         sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    20125             -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
    20126             -e 's|libext="lib"|libext="a"|' \
    20127         libtool > conftest.bla
    20128 
    20129         mv conftest.bla libtool
    20130         chmod 755 libtool
    20131         ;;
    20132     esac
    20133     ;;
     20199      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     20200          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     20201          -e 's|libext="lib"|libext="a"|' \
     20202      libtool > conftest.bla
     20203
     20204      mv conftest.bla libtool
     20205      chmod 755 libtool
     20206      ;;
     20207  esac
     20208      ;;
    2013420209    *-darwin*)
    2013520210      { echo "$as_me:$LINENO: Applying patches to libtool for Darwin" >&5
    … …  
    2017320248    *-mingw32)
    2017420249        RPATH_FLAGS=nothing ;;
    20175     *-sun-*)
     20250    *-*-solaris*)
    2017620251        RPATH_FLAGS=
    2017720252        for dir in $abs_lib_dir; do
    … …  
    2324123316s,@DBG_CFLAGS@,$DBG_CFLAGS,;t t
    2324223317s,@OPT_CFLAGS@,$OPT_CFLAGS,;t t
     23318s,@sol_cc_compiler@,$sol_cc_compiler,;t t
    2324323319s,@CC@,$CC,;t t
    2324423320s,@CFLAGS@,$CFLAGS,;t t

  • stable/2.0/Cbc/examples/Makefile.in

    r706 r845  
    5555
    5656# Directory with COIN header files
    57 COININCDIR = @abs_include_dir@
     57COININCDIR = @abs_include_dir@/coin
    5858
    5959# Directory with COIN libraries

  • stable/2.0/Cbc/src/Makefile.am

    r783 r845  
    286286
    287287# Here list all the header files that are required by a user of the library,
    288 # and that therefore should be installed in 'install'
    289 include_HEADERS = \
     288# and that therefore should be installed in 'install/coin'
     289includecoindir = $(includedir)/coin
     290includecoin_HEADERS = \
    290291        ../inc/config_cbc.h \
    291292        Cbc_C_Interface.h \
    … …  
    329330        echo "#endif" >> bla
    330331        cat $(srcdir)/$(ConfigHeader) >> bla
    331         $(install_sh_DATA) bla $(DESTDIR)$(includedir)/$(ConfigHeader)
     332        $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    332333        rm -f bla
    333334
    334335uninstall-local:
    335         rm -f $(DESTDIR)$(includedir)/$(ConfigHeader)
     336        rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)

  • stable/2.0/Cbc/src/Makefile.in

    r783 r845  
    136136@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_34 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
    137137subdir = src
    138 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     138DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    139139        $(srcdir)/Makefile.in
    140140ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    153153am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    154154am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
    155         "$(DESTDIR)$(includedir)"
     155        "$(DESTDIR)$(includecoindir)"
    156156libLTLIBRARIES_INSTALL = $(INSTALL)
    157157LTLIBRARIES = $(lib_LTLIBRARIES)
    … …  
    263263DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
    264264        $(am__cbc_SOURCES_DIST) $(am__cbc_generic_SOURCES_DIST)
    265 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    266 HEADERS = $(include_HEADERS)
     265includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     266HEADERS = $(includecoin_HEADERS)
    267267ETAGS = etags
    268268CTAGS = ctags
    … …  
    469469sbindir = @sbindir@
    470470sharedstatedir = @sharedstatedir@
     471sol_cc_compiler = @sol_cc_compiler@
    471472sysconfdir = @sysconfdir@
    472473target_alias = @target_alias@
    … …  
    618619
    619620# Here list all the header files that are required by a user of the library,
    620 # and that therefore should be installed in 'install'
    621 include_HEADERS = \
     621# and that therefore should be installed in 'install/coin'
     622includecoindir = $(includedir)/coin
     623includecoin_HEADERS = \
    622624        ../inc/config_cbc.h \
    623625        Cbc_C_Interface.h \
    … …  
    835837        -rm -f libtool
    836838uninstall-info-am:
    837 install-includeHEADERS: $(include_HEADERS)
     839install-includecoinHEADERS: $(includecoin_HEADERS)
    838840        @$(NORMAL_INSTALL)
    839         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    840         @list='$(include_HEADERS)'; for p in $$list; do \
     841        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     842        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    841843          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    842844          f=$(am__strip_dir) \
    843           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    844           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     845          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     846          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    845847        done
    846848
    847 uninstall-includeHEADERS:
     849uninstall-includecoinHEADERS:
    848850        @$(NORMAL_UNINSTALL)
    849         @list='$(include_HEADERS)'; for p in $$list; do \
     851        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    850852          f=$(am__strip_dir) \
    851           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    852           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     853          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     854          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    853855        done
    854856
    … …  
    935937
    936938installdirs:
    937         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
     939        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    938940          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    939941        done
    … …  
    983985info-am:
    984986
    985 install-data-am: install-includeHEADERS
     987install-data-am: install-includecoinHEADERS
    986988
    987989install-exec-am: install-binPROGRAMS install-exec-local \
    … …  
    10121014ps-am:
    10131015
    1014 uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
     1016uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    10151017        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    10161018
    … …  
    10211023        html-am info info-am install install-am install-binPROGRAMS \
    10221024        install-data install-data-am install-exec install-exec-am \
    1023         install-exec-local install-includeHEADERS install-info \
     1025        install-exec-local install-includecoinHEADERS install-info \
    10241026        install-info-am install-libLTLIBRARIES install-man \
    10251027        install-strip installcheck installcheck-am installdirs \
    … …  
    10271029        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    10281030        pdf pdf-am ps ps-am tags uninstall uninstall-am \
    1029         uninstall-binPROGRAMS uninstall-includeHEADERS \
     1031        uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    10301032        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    10311033
    … …  
    10361038        echo "#endif" >> bla
    10371039        cat $(srcdir)/$(ConfigHeader) >> bla
    1038         $(install_sh_DATA) bla $(DESTDIR)$(includedir)/$(ConfigHeader)
     1040        $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    10391041        rm -f bla
    10401042
    10411043uninstall-local:
    1042         rm -f $(DESTDIR)$(includedir)/$(ConfigHeader)
     1044        rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    10431045# Tell versions [3.59,3.63) of GNU make to not export all variables.
    10441046# Otherwise a system limit (for SysV at least) may be exceeded.

  • stable/2.0/Cbc/test/Makefile.in

    r765 r845  
    254254sbindir = @sbindir@
    255255sharedstatedir = @sharedstatedir@
     256sol_cc_compiler = @sol_cc_compiler@
    256257sysconfdir = @sysconfdir@
    257258target_alias = @target_alias@
Note: See TracChangeset for help on using the changeset viewer.