Changeset 3849


Ignore:
Timestamp:
Oct 10, 2018 2:08:50 PM (11 months ago)
Author:
lou
Message:

Collateral damage from BuildTools? r3848.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/autotools-update/configure

    r3812 r3849  
    646646LIBOBJS
    647647subdirs
     648DEPENDENCY_LINKING_FALSE
     649DEPENDENCY_LINKING_TRUE
    648650LT_LDFLAGS
    649651CPP
     
    782784with_sysroot
    783785enable_libtool_lock
     786enable_dependency_linking
    784787'
    785788      ac_precious_vars='build_alias
     
    14221425  --disable-dependency-tracking
    14231426                          speeds up one-time build
    1424   --enable-shared[=PKGS]  build shared libraries [default=no]
    1425   --enable-static[=PKGS]  build static libraries [default=no]
     1427  --enable-shared[=PKGS]  build shared libraries [default=yes]
     1428  --enable-static[=PKGS]  build static libraries [default=yes]
    14261429  --enable-fast-install[=PKGS]
    14271430                          optimize for fast installation [default=yes]
    14281431  --disable-libtool-lock  avoid locking (might break parallel builds)
     1432  --enable-dependency-linking
     1433                          Link all library dependencies into shared libraries
     1434                          at creation (default=yes)
    14291435
    14301436Optional Packages:
     
    31293135# Setting up libtool with LT_INIT will AC_REQUIRE AC_PROG_CC, but we want
    31303136# to invoke it from this macro first so that we can supply a parameter.
    3131 
    31323137
    31333138
     
    76327637# On Windows, shared C++ libraries do not work with the current libtool (it
    76337638# handles only exports for C functions, not C++). On all other systems, build
    7634 # shared libraries.
    7635 
    7636   case $host_os in
    7637     cygwin* | mingw* | msys* )
    7638       # Check whether --enable-shared was given.
     7639# only shared libraries.
     7640
     7641# (lh, 180302) Sadly, we can't use the obvious libtool macros
     7642# (AC_{ENABLE,DISABLE}_{SHARED,STATIC}, nor parameters to LT_INIT,
     7643# precisely because these macros record the default behaviour by defining
     7644# a macro, _LT_ENABLE_{SHARED,STATIC}_DEFAULT. No shell code involved, hence
     7645# any shell conditional has no effect. Either we trust libtool or we need
     7646# something more inventive. The relevant libtool macros are in ltoptions.m4,
     7647# _LT_ENABLE_SHARED and _LT_ENABLE_STATIC.
     7648
     7649# case $host_os in
     7650#   cygwin* | mingw* | msys* )
     7651#     AC_DISABLE_SHARED
     7652#     ;;
     7653#   *)
     7654#     AC_DISABLE_STATIC
     7655#     ;;
     7656# esac
     7657
     7658# Create libtool.
     7659
     7660
     7661
     7662
     7663
     7664# Set options
     7665
     7666
     7667
     7668        enable_dlopen=no
     7669
     7670
     7671  enable_win32_dll=no
     7672
     7673
     7674            # Check whether --enable-shared was given.
    76397675if test "${enable_shared+set}" = set; then :
    76407676  enableval=$enable_shared; p=${PACKAGE-default}
     
    76567692    esac
    76577693else
    7658   enable_shared=no
    7659 fi
    7660 
    7661 
    7662 
    7663 
    7664 
    7665 
    7666 
    7667 
    7668 
    7669       ;;
    7670     *)
    7671       # Check whether --enable-static was given.
     7694  enable_shared=yes
     7695fi
     7696
     7697
     7698
     7699
     7700
     7701
     7702
     7703
     7704
     7705  # Check whether --enable-static was given.
    76727706if test "${enable_static+set}" = set; then :
    76737707  enableval=$enable_static; p=${PACKAGE-default}
     
    76897723    esac
    76907724else
    7691   enable_static=no
    7692 fi
    7693 
    7694 
    7695 
    7696 
    7697 
    7698 
    7699 
    7700 
    7701 
    7702       ;;
    7703   esac
    7704 
    7705 # Create libtool
    7706 
    7707 
    7708 
    7709 
    7710 
    7711 # Set options
    7712 
    7713 
    7714 
    7715         enable_dlopen=no
    7716 
    7717 
    7718   enable_win32_dll=no
     7725  enable_static=yes
     7726fi
     7727
     7728
     7729
     7730
     7731
    77197732
    77207733
     
    1195611969  esac
    1195711970
    11958 # -no-undefined is required for DLLs on Windows
    11959 
    11960   LT_LDFLAGS="-no-undefined"
     11971# Set up LT_LDFLAGS. Add the library version string to LT_LDFLAGS, if one
     11972# is supplied.
     11973
     11974
     11975  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the library version is set" >&5
     11976$as_echo_n "checking if the library version is set... " >&6; }
     11977  if test x"$coin_libversion" != x ; then
     11978    LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
     11979    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_libversion" >&5
     11980$as_echo "$coin_libversion" >&6; }
     11981  else
     11982    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     11983$as_echo "no" >&6; }
     11984  fi
     11985
     11986# Check if dependency linking is enabled or disabled.
     11987
     11988
     11989  # Check whether --enable-dependency-linking was given.
     11990if test "${enable_dependency_linking+set}" = set; then :
     11991  enableval=$enable_dependency_linking; dependency_linking="$enableval"
     11992else
     11993  dependency_linking=yes
     11994fi
     11995
     11996
     11997# AC_SUBST([LT_LDFLAGS])
     11998# if test "$dependency_linking" = yes ; then
     11999#   LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
     12000# fi
     12001
     12002   if test "$dependency_linking" = yes; then
     12003  DEPENDENCY_LINKING_TRUE=
     12004  DEPENDENCY_LINKING_FALSE='#'
     12005else
     12006  DEPENDENCY_LINKING_TRUE='#'
     12007  DEPENDENCY_LINKING_FALSE=
     12008fi
     12009
     12010
    1196112011
    1196212012
     
    1211812168Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1211912169fi
     12170if test -z "${DEPENDENCY_LINKING_TRUE}" && test -z "${DEPENDENCY_LINKING_FALSE}"; then
     12171  as_fn_error $? "conditional \"DEPENDENCY_LINKING\" was never defined.
     12172Usually this means the macro was only invoked conditionally." "$LINENO" 5
     12173fi
    1212012174
    1212112175: "${CONFIG_STATUS=./config.status}"
     
    1271112765double_quote_subst='$double_quote_subst'
    1271212766delay_variable_subst='$delay_variable_subst'
     12767macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
     12768macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
    1271312769enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    1271412770enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    12715 macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
    12716 macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
    1271712771pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
    1271812772enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
     
    1374013794# ### BEGIN LIBTOOL CONFIG
    1374113795
    13742 # Whether or not to build shared libraries.
    13743 build_libtool_libs=$enable_shared
    13744 
    13745 # Whether or not to build static libraries.
    13746 build_old_libs=$enable_static
    13747 
    1374813796# Which release of libtool.m4 was used?
    1374913797macro_version=$macro_version
    1375013798macro_revision=$macro_revision
     13799
     13800# Whether or not to build shared libraries.
     13801build_libtool_libs=$enable_shared
     13802
     13803# Whether or not to build static libraries.
     13804build_old_libs=$enable_static
    1375113805
    1375213806# What type of objects to build.
Note: See TracChangeset for help on using the changeset viewer.