Changeset 1905


Ignore:
Timestamp:
Dec 4, 2010 10:48:03 AM (9 years ago)
Author:
stefan
Message:

list .la files in xxx-uninstalled.pc files; rerun autotools

Location:
ThirdParty/HSL/trunk
Files:
3 edited

Legend:

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

    r1884 r1905  
    213213HSL_CFLAGS = @HSL_CFLAGS@
    214214HSL_CFLAGS_INSTALLED = @HSL_CFLAGS_INSTALLED@
     215HSL_DEPENDENCIES = @HSL_DEPENDENCIES@
    215216HSL_LIBS = @HSL_LIBS@
    216217HSL_LIBS_INSTALLED = @HSL_LIBS_INSTALLED@
     
    239240MAKEINFO = @MAKEINFO@
    240241METIS_CFLAGS = @METIS_CFLAGS@
     242METIS_CFLAGS_INSTALLED = @METIS_CFLAGS_INSTALLED@
    241243METIS_DATA = @METIS_DATA@
    242244METIS_DATA_INSTALLED = @METIS_DATA_INSTALLED@
     245METIS_DEPENDENCIES = @METIS_DEPENDENCIES@
    243246METIS_LIBS = @METIS_LIBS@
     247METIS_LIBS_INSTALLED = @METIS_LIBS_INSTALLED@
    244248MPICC = @MPICC@
    245249MPIF77 = @MPIF77@
  • ThirdParty/HSL/trunk/coinhsl-uninstalled.pc.in

    r1873 r1905  
    55Description: Harwell Subroutines Library
    66Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lcoinhsl @HSL_PCLIBS@
     7Libs: ${libdir}/libcoinhsl.la @HSL_PCLIBS@
    88Cflags: @HAVE_MXXX_CFLAGS@
    99Requires: @HSL_PCREQUIRES@
  • ThirdParty/HSL/trunk/configure

    r1884 r1905  
    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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion HSL_SVN_REV build build_cpu build_vendor build_os COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED FLIBS EGREP FC FCFLAGS ac_ct_FC 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE COIN_HAS_MA77_TRUE COIN_HAS_MA77_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA HSL_CFLAGS HSL_LIBS HSL_PCLIBS HSL_PCREQUIRES HSL_CFLAGS_INSTALLED HSL_LIBS_INSTALLED METIS_DATA_INSTALLED COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE HAVE_MXXX_CFLAGS F77_SHARED_CMD F77_DLL_LINKFLAGS HSL_SHARED_LIB EXPORT_SYMBOLS DEFFILE INSTALL_LOADABLE_LIBRARY_TRUE INSTALL_LOADABLE_LIBRARY_FALSE NEED_DEFFILE_TRUE NEED_DEFFILE_FALSE EXTRA_SHARED_COMMAND_TRUE EXTRA_SHARED_COMMAND_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR 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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion HSL_SVN_REV build build_cpu build_vendor build_os COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED FLIBS EGREP FC FCFLAGS ac_ct_FC 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE COIN_HAS_MA77_TRUE COIN_HAS_MA77_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA METIS_DEPENDENCIES METIS_LIBS_INSTALLED METIS_CFLAGS_INSTALLED METIS_DATA_INSTALLED HSL_CFLAGS HSL_LIBS HSL_PCLIBS HSL_PCREQUIRES HSL_DEPENDENCIES HSL_CFLAGS_INSTALLED HSL_LIBS_INSTALLED COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE HAVE_MXXX_CFLAGS F77_SHARED_CMD F77_DLL_LINKFLAGS HSL_SHARED_LIB EXPORT_SYMBOLS DEFFILE INSTALL_LOADABLE_LIBRARY_TRUE INSTALL_LOADABLE_LIBRARY_FALSE NEED_DEFFILE_TRUE NEED_DEFFILE_FALSE EXTRA_SHARED_COMMAND_TRUE EXTRA_SHARED_COMMAND_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2209822098
    2209922099
     22100
     22101
     22102
     22103
     22104
     22105
     22106
    2210022107#check if user provided LIBS, CFLAGS, or DATA for module
    2210122108if test $coin_has_metis != skipping; then
     
    2238922396
    2239022397
    22391 
     22398fi
     22399
     22400
     22401
     22402if test $coin_has_metis != notGiven &&
     22403                test $coin_has_metis != skipping; then
     22404  COIN_HAS_METIS_TRUE=
     22405  COIN_HAS_METIS_FALSE='#'
     22406else
     22407  COIN_HAS_METIS_TRUE='#'
     22408  COIN_HAS_METIS_FALSE=
     22409fi
     22410
     22411
     22412
     22413  fi
     22414
     22415else
     22416  echo "$as_me:$LINENO: result: $coin_has_metis" >&5
     22417echo "${ECHO_T}$coin_has_metis" >&6
     22418fi
     22419
     22420if test $coin_has_metis != skipping &&
     22421   test $coin_has_metis != notGiven ; then
     22422
     22423cat >>confdefs.h <<\_ACEOF
     22424#define COIN_HAS_METIS 1
     22425_ACEOF
     22426
     22427
     22428  # construct dependencies variables from LIBS variables
     22429  # we add an extra space in LIBS so we can substitute out everything starting with " -"
     22430  METIS_DEPENDENCIES=`echo " $METIS_LIBS" | sed -e 's/ -[^ ]*//g'`
     22431
     22432    HSL_DEPENDENCIES=`echo " $HSL_LIBS" | sed -e 's/ -[^ ]*//g'`
    2239222433
    2239322434
     
    2240122442echo "$as_me: Metis LIBS   are $METIS_LIBS" >&6;}
    2240222443    fi
    22403     if test -n "$METIS_DATA" ; then
    22404       { echo "$as_me:$LINENO: Metis DATA   is  $METIS_DATA" >&5
    22405 echo "$as_me: Metis DATA   is  $METIS_DATA" >&6;}
    22406     fi
    22407     if test -n "$METIS_CFLAGS_INSTALLED" ; then
    22408       { echo "$as_me:$LINENO: Metis CFLAGS_INSTALLED are $METIS_CFLAGS_INSTALLED" >&5
    22409 echo "$as_me: Metis CFLAGS_INSTALLED are $METIS_CFLAGS_INSTALLED" >&6;}
    22410     fi
    22411     if test -n "$METIS_LIBS_INSTALLED" ; then
    22412       { echo "$as_me:$LINENO: Metis LIBS_INSTALLED   are $METIS_LIBS_INSTALLED" >&5
    22413 echo "$as_me: Metis LIBS_INSTALLED   are $METIS_LIBS_INSTALLED" >&6;}
    22414     fi
    22415     if test -n "$METIS_DATA_INSTALLED" ; then
    22416       { echo "$as_me:$LINENO: Metis DATA_INSTALLED   is  $METIS_DATA_INSTALLED" >&5
    22417 echo "$as_me: Metis DATA_INSTALLED   is  $METIS_DATA_INSTALLED" >&6;}
    22418     fi
    22419 
    22420       { echo "$as_me:$LINENO: " >&5
    22421 echo "$as_me: " >&6;}
    22422       { echo "$as_me:$LINENO: HSL CFLAGS are $HSL_CFLAGS" >&5
    22423 echo "$as_me: HSL CFLAGS are $HSL_CFLAGS" >&6;}
    22424       { echo "$as_me:$LINENO: HSL LIBS   are $HSL_LIBS" >&5
    22425 echo "$as_me: HSL LIBS   are $HSL_LIBS" >&6;}
    22426       { echo "$as_me:$LINENO: HSL CFLAGS_INSTALLED are $HSL_CFLAGS_INSTALLED" >&5
    22427 echo "$as_me: HSL CFLAGS_INSTALLED are $HSL_CFLAGS_INSTALLED" >&6;}
    22428       { echo "$as_me:$LINENO: HSL LIBS_INSTALLED   are $HSL_LIBS_INSTALLED" >&5
    22429 echo "$as_me: HSL LIBS_INSTALLED   are $HSL_LIBS_INSTALLED" >&6;}
    22430 
    22431   fi
    22432 
    22433 fi
    22434 
    22435 
    22436 
    22437 if test $coin_has_metis != notGiven &&
    22438                 test $coin_has_metis != skipping; then
    22439   COIN_HAS_METIS_TRUE=
    22440   COIN_HAS_METIS_FALSE='#'
    22441 else
    22442   COIN_HAS_METIS_TRUE='#'
    22443   COIN_HAS_METIS_FALSE=
    22444 fi
    22445 
    22446 
    22447 
    22448   fi
    22449 
    22450 else
    22451   echo "$as_me:$LINENO: result: $coin_has_metis" >&5
    22452 echo "${ECHO_T}$coin_has_metis" >&6
    22453 fi
    22454 
    22455 if test $coin_has_metis != skipping &&
    22456    test $coin_has_metis != notGiven ; then
    22457 
    22458 cat >>confdefs.h <<\_ACEOF
    22459 #define COIN_HAS_METIS 1
    22460 _ACEOF
    22461 
    22462 
    22463   if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    22464     if test -n "$METIS_CFLAGS" ; then
    22465       { echo "$as_me:$LINENO: Metis CFLAGS are $METIS_CFLAGS" >&5
    22466 echo "$as_me: Metis CFLAGS are $METIS_CFLAGS" >&6;}
    22467     fi
    22468     if test -n "$METIS_LIBS" ; then
    22469       { echo "$as_me:$LINENO: Metis LIBS   are $METIS_LIBS" >&5
    22470 echo "$as_me: Metis LIBS   are $METIS_LIBS" >&6;}
     22444    if test -n "$METIS_DEPENDENCIES" ; then
     22445      { echo "$as_me:$LINENO: Metis DEPENDENCIES are $METIS_DEPENDENCIES" >&5
     22446echo "$as_me: Metis DEPENDENCIES are $METIS_DEPENDENCIES" >&6;}
    2247122447    fi
    2247222448    if test -n "$METIS_DATA" ; then
     
    2248322459      { echo "$as_me:$LINENO: HSL LIBS   are $HSL_LIBS" >&5
    2248422460echo "$as_me: HSL LIBS   are $HSL_LIBS" >&6;}
     22461      { echo "$as_me:$LINENO: HSL DEPENDENCIES are $HSL_DEPENDENCIES" >&5
     22462echo "$as_me: HSL DEPENDENCIES are $HSL_DEPENDENCIES" >&6;}
    2248522463
    2248622464  fi
     
    2356923547s,@METIS_CFLAGS@,$METIS_CFLAGS,;t t
    2357023548s,@METIS_DATA@,$METIS_DATA,;t t
     23549s,@METIS_DEPENDENCIES@,$METIS_DEPENDENCIES,;t t
     23550s,@METIS_LIBS_INSTALLED@,$METIS_LIBS_INSTALLED,;t t
     23551s,@METIS_CFLAGS_INSTALLED@,$METIS_CFLAGS_INSTALLED,;t t
     23552s,@METIS_DATA_INSTALLED@,$METIS_DATA_INSTALLED,;t t
    2357123553s,@HSL_CFLAGS@,$HSL_CFLAGS,;t t
    2357223554s,@HSL_LIBS@,$HSL_LIBS,;t t
    2357323555s,@HSL_PCLIBS@,$HSL_PCLIBS,;t t
    2357423556s,@HSL_PCREQUIRES@,$HSL_PCREQUIRES,;t t
     23557s,@HSL_DEPENDENCIES@,$HSL_DEPENDENCIES,;t t
    2357523558s,@HSL_CFLAGS_INSTALLED@,$HSL_CFLAGS_INSTALLED,;t t
    2357623559s,@HSL_LIBS_INSTALLED@,$HSL_LIBS_INSTALLED,;t t
    23577 s,@METIS_DATA_INSTALLED@,$METIS_DATA_INSTALLED,;t t
    2357823560s,@COIN_HAS_METIS_TRUE@,$COIN_HAS_METIS_TRUE,;t t
    2357923561s,@COIN_HAS_METIS_FALSE@,$COIN_HAS_METIS_FALSE,;t t
Note: See TracChangeset for help on using the changeset viewer.