Changeset 4130


Ignore:
Timestamp:
Mar 19, 2020 7:17:16 AM (2 weeks ago)
Author:
stefan
Message:

rerun autotools; adjust automake options

  • foreign is now a default automake-option
  • so try to restore the original 'gnu' by adding AUTOMAKE_OPTIONS = gnu to some of glpk's Makefile.am
Location:
ThirdParty/Glpk/trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/Makefile.am

    r4061 r4130  
    22# All Rights Reserved.
    33# This file is distributed under the Eclipse Public License.
    4 
    5 ## $Id$
    6 
    7 AUTOMAKE_OPTIONS = foreign
    84
    95pkgconfiglibdir = $(libdir)/pkgconfig
  • ThirdParty/Glpk/trunk/Makefile.in

    r4061 r4130  
    273273top_builddir = @top_builddir@
    274274top_srcdir = @top_srcdir@
    275 AUTOMAKE_OPTIONS = foreign
    276275pkgconfiglibdir = $(libdir)/pkgconfig
    277276pkgconfiglib_DATA = coinglpk.pc
  • ThirdParty/Glpk/trunk/configure

    r4110 r4130  
    25222522
    25232523# Initialize automake
     2524# - do not be as strict as for GNU projects
    25242525# - don't AC_DEFINE PACKAGE or VERSION (but there're still defined as shell
    25252526#   variables in configure, and as make variables).
    25262527# - disable dist target
     2528# - place objects from sources in subdirs into corresponding subdirs
    25272529# - enable all automake warnings
    25282530
  • ThirdParty/Glpk/trunk/glpk_config.patch

    r4061 r4130  
    5252 ## Process this file with automake to produce Makefile.in ##
    5353 
    54 +AUTOMAKE_OPTIONS = subdir-objects
     54+AUTOMAKE_OPTIONS = gnu
    5555+
    5656 include_HEADERS = glpk.h
     
    8383--- glpk/examples/Makefile.am   2018-02-15 23:00:00.000000000 -0800
    8484+++ glpk/examples/Makefile.am   2020-01-14 13:46:52.053812700 -0800
    85 @@ -2,7 +2,9 @@
     85@@ -2,7 +2,11 @@
    8686 
    8787 AM_CPPFLAGS = -I$(srcdir)/../src
    8888 
     89+AUTOMAKE_OPTIONS = gnu
     90+
    8991-LDADD = ../src/libglpk.la
    9092+# Change name from libglpk to libcoinglpk.
  • ThirdParty/Glpk/trunk/glpk_config_files/Makefile.in

    r4071 r4130  
    289289          case '$(am__configure_deps)' in \
    290290            *$$dep*) \
    291               echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
    292               $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
     291              echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
     292              $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
    293293                && exit 0; \
    294294              exit 1;; \
    295295          esac; \
    296296        done; \
    297         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
     297        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
    298298        $(am__cd) $(top_srcdir) && \
    299           $(AUTOMAKE) --gnu Makefile
     299          $(AUTOMAKE) --foreign Makefile
    300300Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    301301        @case '$?' in \
  • ThirdParty/Glpk/trunk/glpk_config_files/aclocal.m4

    r4118 r4130  
    14131413
    14141414# Initialize automake
     1415# - do not be as strict as for GNU projects
    14151416# - don't AC_DEFINE PACKAGE or VERSION (but there're still defined as shell
    14161417#   variables in configure, and as make variables).
    14171418# - disable dist target
     1419# - place objects from sources in subdirs into corresponding subdirs
    14181420# - enable all automake warnings
    14191421
    1420   AM_INIT_AUTOMAKE([no-define no-dist -Wall])
     1422  AM_INIT_AUTOMAKE([foreign no-define no-dist subdir-objects -Wall])
    14211423
    14221424# Disable automatic rebuild of configure/Makefile. Use run_autotools.
     
    14881490#    and explicitly dll-exporting them, leading to warnings about duplicates
    14891491#    regarding those that are properly marked for dll-export in the source.
     1492# 5. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
     1493#    the MKL libraries (which are pretty big). Instead, treat them like other -l<...> libs.
     1494# 6. Add MKL libraries to dependency_libs in .la file, which I guess should be
     1495#    the case due to point 5.
    14901496#
    14911497# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
     
    15041510             -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
    15051511             m4_bmatch($1,no-win32-dll,,[-e 's|always_export_symbols=yes|always_export_symbols=no|g']) \
     1512             -e '/func_append old_deplibs/s/\(.*\)/case $arg in *mkl_*.lib) ;; *) \1 ;; esac/g' \
     1513             -e '/static library .deplib is not portable/a case $deplib in *mkl_*.lib) newdependency_libs="$deplib $newdependency_libs" ;; esac' \
    15061514         libtool > libtool.tmp
    15071515         mv libtool.tmp libtool
     
    22222230# is assigned to prim_data.
    22232231
    2224   withval=$m4_tolower(with_$1)
     2232  withval="$m4_tolower(with_$1)"
    22252233  if test -n "$withval" ; then
    22262234    case "$withval" in
     
    22372245        m4_tolower(coin_has_$1)=yes
    22382246        m4_if(m4_default($4,nodata),dataonly,
    2239           [m4_tolower($1_data)=$withval],
    2240           [m4_tolower($1_lflags)=$withval])
     2247          [m4_tolower($1_data)="$withval"],
     2248          [m4_tolower($1_lflags)="$withval"])
    22412249        ;;
    22422250    esac
     
    22492257  m4_if(m4_default($4,nodata),dataonly,[],
    22502258    [if test "$m4_tolower(coin_has_$1)" != skipping ; then
    2251        withval=$m4_tolower(with_$1_lflags)
     2259       withval="$m4_tolower(with_$1_lflags)"
    22522260       if test -n "$withval" ; then
    22532261         case "$withval" in
     
    22572265           * )
    22582266             m4_tolower(coin_has_$1)=yes
    2259              m4_tolower($1_lflags)=$withval
     2267             m4_tolower($1_lflags)="$withval"
    22602268             ;;
    22612269         esac
    22622270       fi
    22632271
    2264        withval=$m4_tolower(with_$1_cflags)
     2272       withval="$m4_tolower(with_$1_cflags)"
    22652273       if test -n "$withval" ; then
    22662274         case "$withval" in
     
    22812289  m4_if(m4_default($4,nodata),nodata,[],
    22822290    [if test "$m4_tolower(coin_has_$1)" != skipping ; then
    2283        withval=$m4_tolower(with_$1_data)
     2291       withval="$m4_tolower(with_$1_data)"
    22842292       if test -n "$withval" ; then
    22852293         case "$withval" in
     
    23582366# Define BUILDTOOLS_DEBUG to enable debugging output
    23592367
    2360     if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2361       AC_MSG_NOTICE([FIND_PRIM_PKG result for $1: "$m4_tolower(coin_has_$1)"])
    2362       AC_MSG_NOTICE([Collected values for package '$1'])
    2363       AC_MSG_NOTICE([m4_tolower($1_lflags) is "$m4_tolower($1_lflags)"])
    2364       AC_MSG_NOTICE([m4_tolower($1_cflags) is "$m4_tolower($1_cflags)"])
    2365       AC_MSG_NOTICE([m4_tolower($1_data) is "$m4_tolower($1_data)"])
    2366       AC_MSG_NOTICE([m4_tolower($1_pcfiles) is "$m4_tolower($1_pcfiles)"])
    2367     fi
     2368  if test "$BUILDTOOLS_DEBUG" = 1 ; then
     2369    AC_MSG_NOTICE([FIND_PRIM_PKG result for $1: "$m4_tolower(coin_has_$1)"])
     2370    AC_MSG_NOTICE([Collected values for package '$1'])
     2371    AC_MSG_NOTICE([m4_tolower($1_lflags) is "$m4_tolower($1_lflags)"])
     2372    AC_MSG_NOTICE([m4_tolower($1_cflags) is "$m4_tolower($1_cflags)"])
     2373    AC_MSG_NOTICE([m4_tolower($1_data) is "$m4_tolower($1_data)"])
     2374    AC_MSG_NOTICE([m4_tolower($1_pcfiles) is "$m4_tolower($1_pcfiles)"])
     2375  fi
    23682376
    23692377])  # COIN_FIND_PRIM_PKG
     
    30513059
    30523060# Set up command line arguments with DEF_PRIM_ARGS.
    3053   AC_COIN_DEF_PRIM_ARGS([lapack],yes,yes,yes,no)
     3061  AC_COIN_DEF_PRIM_ARGS([lapack],yes,yes,no,no)
    30543062
    30553063# Give FIND_PRIM_PKG a chance to look for user-specified lapack flags,
     
    31033111
    31043112      *-cygwin* | *-mingw* | *-msys*)
    3105         # check for 64-bit sequential MKL
    3106         if test "$enable_shared" = yes ; then
    3107           AC_COIN_TRY_LINK([dsyev],[mkl_intel_lp64_dll.lib mkl_sequential_dll.lib mkl_core_dll.lib],[],
     3113        # check for 64-bit sequential MKL in $LIB
     3114        old_IFS="$IFS"
     3115        IFS=";"
     3116        for d in $LIB ; do
     3117          # turn $d into unix-style short path (no spaces); cannot do -us, so first do -ws, then -u
     3118          d=`cygpath -ws "$d"`
     3119          d=`cygpath -u "$d"`
     3120          if test "$enable_shared" = yes ; then
     3121            if test -e "$d/mkl_core_dll.lib" ; then
     3122              coin_mkl="$d/mkl_intel_lp64_dll.lib $d/mkl_sequential_dll.lib $d/mkl_core_dll.lib"
     3123              break
     3124            fi
     3125          else
     3126            if test -e "$d/mkl_core.lib" ; then
     3127              coin_mkl="$d/mkl_intel_lp64.lib $d/mkl_sequential.lib $d/mkl_core.lib"
     3128              break
     3129            fi
     3130          fi
     3131        done
     3132        IFS="$old_IFS"
     3133        AC_COIN_TRY_LINK([dsyev],[$coin_mkl],[],
    31083134            [coin_has_lapack=yes
    3109              lapack_lflags="mkl_intel_lp64_dll.lib mkl_sequential_dll.lib mkl_core_dll.lib"])
    3110         else
    3111           AC_COIN_TRY_LINK([dsyev],[mkl_intel_lp64.lib mkl_sequential.lib mkl_core.lib],[],
    3112             [coin_has_lapack=yes
    3113              lapack_lflags="mkl_intel_lp64.lib mkl_sequential.lib mkl_core.lib"])
    3114         fi
     3135             lapack_lflags="$coin_mkl"])
    31153136      ;;
    31163137
  • ThirdParty/Glpk/trunk/glpk_config_files/configure

    r4118 r4130  
    30123012
    30133013# Initialize automake
     3014# - do not be as strict as for GNU projects
    30143015# - don't AC_DEFINE PACKAGE or VERSION (but there're still defined as shell
    30153016#   variables in configure, and as make variables).
    30163017# - disable dist target
     3018# - place objects from sources in subdirs into corresponding subdirs
    30173019# - enable all automake warnings
    30183020
     
    1243312435#    and explicitly dll-exporting them, leading to warnings about duplicates
    1243412436#    regarding those that are properly marked for dll-export in the source.
     12437# 5. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
     12438#    the MKL libraries (which are pretty big). Instead, treat them like other -l<...> libs.
     12439# 6. Add MKL libraries to dependency_libs in .la file, which I guess should be
     12440#    the case due to point 5.
    1243512441#
    1243612442# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
     
    1503515041             -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
    1503615042             -e 's|always_export_symbols=yes|always_export_symbols=no|g' \
     15043             -e '/func_append old_deplibs/s/\(.*\)/case $arg in *mkl_*.lib) ;; *) \1 ;; esac/g' \
     15044             -e '/static library .deplib is not portable/a case $deplib in *mkl_*.lib) newdependency_libs="$deplib $newdependency_libs" ;; esac' \
    1503715045         libtool > libtool.tmp
    1503815046         mv libtool.tmp libtool
  • ThirdParty/Glpk/trunk/glpk_config_files/examples/Makefile.am

    r4051 r4130  
    22
    33AM_CPPFLAGS = -I$(srcdir)/../src
     4
     5AUTOMAKE_OPTIONS = gnu
    46
    57# Change name from libglpk to libcoinglpk.
  • ThirdParty/Glpk/trunk/glpk_config_files/examples/Makefile.in

    r4071 r4130  
    291291top_srcdir = @top_srcdir@
    292292AM_CPPFLAGS = -I$(srcdir)/../src
     293AUTOMAKE_OPTIONS = gnu
    293294
    294295# Change name from libglpk to libcoinglpk.
     
    397398
    398399.c.o:
    399 @am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    400 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     400@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     401@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     402@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
    401403@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    402404@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    404406
    405407.c.obj:
    406 @am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
    407 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     408@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     409@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     410@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
    408411@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    409412@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    411414
    412415.c.lo:
    413 @am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    414 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
     416@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     417@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     418@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Plo
    415419@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    416420@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  • ThirdParty/Glpk/trunk/glpk_config_files/src/Makefile.am

    r4056 r4130  
    11## Process this file with automake to produce Makefile.in ##
    22
    3 AUTOMAKE_OPTIONS = subdir-objects
     3AUTOMAKE_OPTIONS = gnu
    44
    55include_HEADERS = glpk.h
  • ThirdParty/Glpk/trunk/glpk_config_files/src/Makefile.in

    r4071 r4130  
    625625top_builddir = @top_builddir@
    626626top_srcdir = @top_srcdir@
    627 AUTOMAKE_OPTIONS = subdir-objects
     627AUTOMAKE_OPTIONS = gnu
    628628include_HEADERS = glpk.h
    629629
Note: See TracChangeset for help on using the changeset viewer.