Changeset 1545


Ignore:
Timestamp:
May 1, 2010 9:03:12 AM (10 years ago)
Author:
stefan
Message:

switch to BuildTools?/trunk; rerun autotools

Location:
ThirdParty/All/branches/split
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/All/branches/split

    • Property svn:externals
      •  

        old new  
        1 BuildTools           https://projects.coin-or.org/svn/BuildTools/branches/split
         1BuildTools           https://projects.coin-or.org/svn/BuildTools/trunk
        22ThirdParty/ASL       https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/branches/split
        33ThirdParty/Blas      https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/branches/split
  • ThirdParty/All/branches/split/Externals

    r1489 r1545  
    1 BuildTools           https://projects.coin-or.org/svn/BuildTools/branches/split
     1BuildTools           https://projects.coin-or.org/svn/BuildTools/trunk
    22ThirdParty/ASL       https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/branches/split
    33ThirdParty/Blas      https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/branches/split
  • ThirdParty/All/branches/split/Makefile.in

    r1489 r1545  
    109109CDEFS = @CDEFS@
    110110CFLAGS = @CFLAGS@
     111COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     112COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     113COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    111114COIN_SKIP_PROJECTS = @COIN_SKIP_PROJECTS@
    112115CPP = @CPP@
  • ThirdParty/All/branches/split/configure

    r1468 r1545  
    481481ac_subdirs_all="$ac_subdirs_all ThirdParty/Metis"
    482482ac_subdirs_all="$ac_subdirs_all ThirdParty/Mumps"
    483 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 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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 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 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_SKIP_PROJECTS subdirs LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     483ac_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 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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 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 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_SKIP_PROJECTS subdirs LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    484484ac_subst_files=''
    485485
     
    11341134  --with-tags[=TAGS]
    11351135                          include additional configurations [automatic]
     1136  --with-coin-instdir     prefix of installation directory for precompiled
     1137                          COIN packages
    11361138  --with-asl-lib linker flags for using project ASL
    11371139  --with-asl-incdir directory with header files for using project ASL
    11381140  --with-asl-datadir directory with data files for using project ASL
    1139   --with-coin-instdir     prefix of installation directory for precompiled
    1140                           COIN packages
    11411141  --with-blas-lib linker flags for using project Blas
    11421142  --with-blas-incdir directory with header files for using project Blas
     
    2097120971
    2097220972
     20973
     20974if test -n "$PKG_CONFIG"; then
     20975  COIN_HAS_PKGCONFIG_TRUE=
     20976  COIN_HAS_PKGCONFIG_FALSE='#'
     20977else
     20978  COIN_HAS_PKGCONFIG_TRUE='#'
     20979  COIN_HAS_PKGCONFIG_FALSE=
     20980fi
     20981
     20982
     20983
     20984# assemble search path for pkg-config, if we are in a project setup
     20985if test x$coin_projectdir = xyes ; then
     20986  COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     20987
     20988  # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     20989  # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     20990  # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     20991  if test -d "${prefix}"; then
     20992    COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20993  fi
     20994
     20995
     20996# Check whether --with-coin-instdir or --without-coin-instdir was given.
     20997if test "${with_coin_instdir+set}" = set; then
     20998  withval="$with_coin_instdir"
     20999  if test -d "$withval"; then : ; else
     21000       { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     21001echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
     21002   { (exit 1); exit 1; }; }
     21003     fi
     21004     COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     21005
     21006fi;
     21007
     21008  # in a classic setup, we want to find uninstalled projects
     21009  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     21010  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     21011  # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
     21012  if test -e ../coin_subdirs.txt ; then
     21013    for i in `cat ../coin_subdirs.txt` ; do
     21014      COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     21015    done
     21016  fi
     21017
     21018  if test -e ../../coin_subdirs.txt ; then
     21019    for i in `cat ../../coin_subdirs.txt` ; do
     21020      COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     21021    done
     21022  fi
     21023
     21024
     21025fi
     21026
     21027
     21028
    2097321029echo "$as_me:$LINENO: checking whether project ASL is available" >&5
    2097421030echo $ECHO_N "checking whether project ASL is available... $ECHO_C" >&6
     
    2227422330Usually this means the macro was only invoked conditionally." >&5
    2227522331echo "$as_me: error: conditional \"HAVE_EXTERNALS\" was never defined.
     22332Usually this means the macro was only invoked conditionally." >&2;}
     22333   { (exit 1); exit 1; }; }
     22334fi
     22335if test -z "${COIN_HAS_PKGCONFIG_TRUE}" && test -z "${COIN_HAS_PKGCONFIG_FALSE}"; then
     22336  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_PKGCONFIG\" was never defined.
     22337Usually this means the macro was only invoked conditionally." >&5
     22338echo "$as_me: error: conditional \"COIN_HAS_PKGCONFIG\" was never defined.
    2227622339Usually this means the macro was only invoked conditionally." >&2;}
    2227722340   { (exit 1); exit 1; }; }
     
    2290322966s,@PKG_CONFIG@,$PKG_CONFIG,;t t
    2290422967s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
     22968s,@COIN_HAS_PKGCONFIG_TRUE@,$COIN_HAS_PKGCONFIG_TRUE,;t t
     22969s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
     22970s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
    2290522971s,@COIN_SKIP_PROJECTS@,$COIN_SKIP_PROJECTS,;t t
    2290622972s,@subdirs@,$subdirs,;t t
Note: See TracChangeset for help on using the changeset viewer.