Changeset 4064


Ignore:
Timestamp:
Jan 16, 2020 9:48:08 AM (5 months ago)
Author:
stefan
Message:

set prefix in .pc file relative to pcfiledir, if libdir unchanged; for coin-or/Cbc#281

Location:
ThirdParty/HSL/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/coinhsl.pc.in

    r4023 r4064  
    1 prefix=@prefix@
     1@LIBDIR_IS_DEFAULT_FALSE@prefix=@prefix@
     2@LIBDIR_IS_DEFAULT_TRUE@prefix=${pcfiledir}/../..
    23exec_prefix=@exec_prefix@
    34libdir=@libdir@
  • ThirdParty/HSL/trunk/configure

    r4046 r4064  
    725725LDFLAGS
    726726CFLAGS
     727LIBDIR_IS_DEFAULT_FALSE
     728LIBDIR_IS_DEFAULT_TRUE
    727729MAINT
    728730MAINTAINER_MODE_FALSE
     
    33273329    eval expanded_libdir=$expanded_libdir
    33283330  done
     3331
     3332   if test "$expanded_libdir" = "$prefix/lib"; then
     3333  LIBDIR_IS_DEFAULT_TRUE=
     3334  LIBDIR_IS_DEFAULT_FALSE='#'
     3335else
     3336  LIBDIR_IS_DEFAULT_TRUE='#'
     3337  LIBDIR_IS_DEFAULT_FALSE=
     3338fi
     3339
     3340
    33293341  prefix=$save_prefix
    33303342  exec_prefix=$save_exec_prefix
     
    34073419
    34083420  # If enable-msvc, then test for Intel (on Windows) and MS C compiler
    3409   # explicitly and add compile-wrapper before AC_PROG_CC, because
    3410   # the compile-wrapper work around issues when having the wrong link.exe
    3411   # in the PATH first, which would upset tests in AC_PROG_CC.
    3412   # Further, if CC unset and not set by user, then stop with error.
     3421  # explicitly and add the compile wrapper before AC_PROG_CC. The compile
     3422  # wrapper works around issues related to finding MS link.exe. (Unix link.exe
     3423  # occurs first in PATH, which causes compile and link checks to fail.) For
     3424  # the same reason, set LD to use the compile wrapper. If CC remains unset
     3425  # (neither icl or cl was found, and CC was not set by the user), stop with
     3426  # an error.
     3427
    34133428  if test $enable_msvc = yes ; then
    34143429    for ac_prog in icl cl
     
    34563471    if test -n "$CC" ; then
    34573472      CC="$am_aux_dir/compile $CC"
     3473      ac_cv_prog_CC="$CC"
     3474      LD="$CC"
    34583475    else
    34593476      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     
    34613478  fi
    34623479
    3463   # look for some C compiler and check whether it works
    3464   # if user has set CC or we found icl/cl above, this shouldn't overwrite CC
    3465   # other than CXX of F77, this macro also takes care of adding the compile-wrapper
     3480  # Look for some C compiler and check that it works. If the user has set CC
     3481  # or we found icl/cl above, this shouldn't overwrite CC. Unlike the macros
     3482  # that establish C++ or Fortran compilers, PROG_CC also takes care of adding
     3483  # the compile wrapper if needed.
     3484
    34663485  ac_ext=c
    34673486ac_cpp='$CPP $CPPFLAGS'
     
    42684287  else
    42694288    # If enable-msvc, then test for Intel Fortran compiler for Windows
    4270     # explicitly and add compile-wrapper before AC_PROG_F77, because
    4271     # the compile-wrapper work around issues when having the wrong link.exe
    4272     # in the PATH first, which could upset tests in AC_PROG_F77.
     4289    # explicitly and add the compile wrapper before AC_PROG_F77. The compile
     4290    # wrapper works around issues related to finding MS link.exe. (Unix
     4291    # link.exe occurs first in PATH, which causes compile and link checks to
     4292    # fail.) For the same reason, set LD to use the compile wrapper.
    42734293    if test $enable_msvc = yes ; then
    42744294      for ac_prog in ifort
     
    43164336      if test -n "$F77" ; then
    43174337        F77="$am_aux_dir/compile $F77"
     4338        ac_cv_prog_F77="$F77"
     4339        LD="$F77"
    43184340      fi
    43194341    fi
    43204342
    4321     # if not msvc-enabled, then look for some Fortran compiler and check whether it works
    4322     # if F77 is set, then this only checks whether it works
     4343    # If not msvc-enabled, then look for some Fortran compiler and check
     4344    # whether it works. If F77 is set, this simply checks whether it works.
    43234345    if test $enable_msvc = no || test -n "$F77" ; then
    43244346      ac_ext=f
     
    1982519847#    regarding those that are properly marked for dll-export in the source.
    1982619848#
    19827 # Patch libtool also to circumbent some issues when using MinGW (Msys+GCC).
     19849# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
    1982819850# 1. Relax check which libraries can be used when linking a DLL.
    1982919851#    libtool's func_mode_link() would reject linking MinGW system libraries,
     
    2189421916if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
    2189521917  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
     21918Usually this means the macro was only invoked conditionally." "$LINENO" 5
     21919fi
     21920if test -z "${LIBDIR_IS_DEFAULT_TRUE}" && test -z "${LIBDIR_IS_DEFAULT_FALSE}"; then
     21921  as_fn_error $? "conditional \"LIBDIR_IS_DEFAULT\" was never defined.
    2189621922Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2189721923fi
Note: See TracChangeset for help on using the changeset viewer.