Changeset 4020


Ignore:
Timestamp:
Sep 17, 2019 4:58:14 AM (4 weeks ago)
Author:
stefan
Message:

merge r4008 and r4011 from mumps5: use win32-dll

  • define MUMPS_CALL to do a proper dllex/import
  • create and install own version of mumps_compat.h to pass on MUMPS_CALL
  • need also config.h.in, otherwise autoheader overwrites mumps_compat.h.in
Location:
ThirdParty/Mumps/branches/autotools-update
Files:
6 edited
2 copied

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/branches/autotools-update

  • ThirdParty/Mumps/branches/autotools-update/Makefile.am

    r3989 r4020  
    7474CLEANFILES = *.mod
    7575
    76 # Reset DEFS to that they don't show up for the Fortran compiler
    77 DEFS =
    7876CFLAGS += $(MY_DEFS)
    7977FCFLAGS += $(MY_FDEFS)
     
    8785thirdpartyinclude_HEADERS = \
    8886  MUMPS/include/dmumps_c.h \
    89   MUMPS/include/mumps_compat.h \
    9087  MUMPS/include/mumps_c_types.h \
    91   MUMPS/libseq/mumps_mpi.h
     88  MUMPS/libseq/mumps_mpi.h \
     89  mumps_compat.h
    9290
    9391pkgconfiglibdir = $(libdir)/pkgconfig
  • ThirdParty/Mumps/branches/autotools-update/Makefile.in

    r3989 r4020  
    105105 configure.lineno config.status.lineno
    106106mkinstalldirs = $(install_sh) -d
     107CONFIG_HEADER = config.h mumps_compat.h
    107108CONFIG_CLEAN_FILES = coinmumps.pc
    108109CONFIG_CLEAN_VPATH_FILES =
     
    241242DATA = $(pkgconfiglib_DATA)
    242243HEADERS = $(thirdpartyinclude_HEADERS)
    243 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     244am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
     245        $(LISP)config.h.in mumps_compat.h.in
    244246# Read a list of newline-separated strings from the standard input,
    245247# and print each of them once, without duplicates.  Input order is
     
    266268AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    267269AR = @AR@
     270AS = @AS@
    268271AUTOCONF = @AUTOCONF@
    269272AUTOHEADER = @AUTOHEADER@
     
    277280CPPFLAGS = @CPPFLAGS@
    278281CYGPATH_W = @CYGPATH_W@
    279 
    280 # Reset DEFS to that they don't show up for the Fortran compiler
    281 DEFS =
     282DEFS = @DEFS@
    282283DEPDIR = @DEPDIR@
    283284DLLTOOL = @DLLTOOL@
     
    443444thirdpartyinclude_HEADERS = \
    444445  MUMPS/include/dmumps_c.h \
    445   MUMPS/include/mumps_compat.h \
    446446  MUMPS/include/mumps_c_types.h \
    447   MUMPS/libseq/mumps_mpi.h
     447  MUMPS/libseq/mumps_mpi.h \
     448  mumps_compat.h
    448449
    449450pkgconfiglibdir = $(libdir)/pkgconfig
     
    456457# Files that are generated and should be cleaned with make distclean
    457458DISTCLEANFILES =
    458 all: all-am
     459all: config.h mumps_compat.h
     460        $(MAKE) $(AM_MAKEFLAGS) all-am
    459461
    460462.SUFFIXES:
     
    493495        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    494496$(am__aclocal_m4_deps):
     497
     498config.h: stamp-h1
     499        @test -f $@ || rm -f stamp-h1
     500        @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
     501
     502stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
     503        @rm -f stamp-h1
     504        cd $(top_builddir) && $(SHELL) ./config.status config.h
     505$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     506        ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
     507        rm -f stamp-h1
     508        touch $@
     509
     510mumps_compat.h: stamp-h2
     511        @test -f $@ || rm -f stamp-h2
     512        @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
     513
     514stamp-h2: $(srcdir)/mumps_compat.h.in $(top_builddir)/config.status
     515        @rm -f stamp-h2
     516        cd $(top_builddir) && $(SHELL) ./config.status mumps_compat.h
     517
     518distclean-hdr:
     519        -rm -f config.h stamp-h1 mumps_compat.h stamp-h2
    495520coinmumps.pc: $(top_builddir)/config.status $(srcdir)/coinmumps.pc.in
    496521        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    788813check-am: all-am
    789814check: check-am
    790 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
     815all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h \
     816                mumps_compat.h
    791817installdirs:
    792818        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     
    848874        -rm -f Makefile
    849875distclean-am: clean-am distclean-compile distclean-generic \
    850         distclean-libtool distclean-tags
     876        distclean-hdr distclean-libtool distclean-tags
    851877
    852878dvi: dvi-am
     
    923949        uninstall-thirdpartyincludeHEADERS
    924950
    925 .MAKE: install-am install-strip
     951.MAKE: all install-am install-strip
    926952
    927953.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \
    928954        check-am clean clean-cscope clean-generic clean-libLTLIBRARIES \
    929955        clean-libtool cscope cscopelist-am ctags ctags-am distclean \
    930         distclean-compile distclean-generic distclean-libtool \
    931         distclean-tags dvi dvi-am html html-am info info-am install \
    932         install-am install-data install-data-am install-dvi \
    933         install-dvi-am install-exec install-exec-am install-html \
    934         install-html-am install-info install-info-am \
     956        distclean-compile distclean-generic distclean-hdr \
     957        distclean-libtool distclean-tags dvi dvi-am html html-am info \
     958        info-am install install-am install-data install-data-am \
     959        install-dvi install-dvi-am install-exec install-exec-am \
     960        install-html install-html-am install-info install-info-am \
    935961        install-libLTLIBRARIES install-man install-pdf install-pdf-am \
    936962        install-pkgconfiglibDATA install-ps install-ps-am \
  • ThirdParty/Mumps/branches/autotools-update/coinmumps.pc.in

    r3989 r4020  
    1010Libs: -L${libdir} -lcoinmumps
    1111Libs.private: @MUMPS_LFLAGS_NOPC@
    12 Cflags: -I${includedir} -DCOIN_USE_MUMPS_MPI_H
     12Cflags: -I${includedir}
    1313Requires.private: @MUMPS_PCFILES@
  • ThirdParty/Mumps/branches/autotools-update/configure

    r4019 r4020  
    673673ac_ct_AR
    674674AR
    675 DLLTOOL
    676 OBJDUMP
    677675LN_S
    678676NM
     
    685683SED
    686684LIBTOOL
     685OBJDUMP
     686DLLTOOL
     687AS
    687688ac_ct_FC
    688689FCFLAGS
     
    56745675
    56755676
    5676 
    5677 
    5678 
    56795677{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
    56805678$as_echo_n "checking how to recognize dependent libraries... " >&6; }
     
    60126010
    60136011test -z "$DLLTOOL" && DLLTOOL=dlltool
    6014 
    6015 
    6016 
    60176012
    60186013
     
    83358330
    83368331
     8332enable_win32_dll=yes
     8333
     8334case $host in
     8335*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
     8336  if test -n "$ac_tool_prefix"; then
     8337  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
     8338set dummy ${ac_tool_prefix}as; ac_word=$2
     8339{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8340$as_echo_n "checking for $ac_word... " >&6; }
     8341if ${ac_cv_prog_AS+:} false; then :
     8342  $as_echo_n "(cached) " >&6
     8343else
     8344  if test -n "$AS"; then
     8345  ac_cv_prog_AS="$AS" # Let the user override the test.
     8346else
     8347as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8348for as_dir in $PATH
     8349do
     8350  IFS=$as_save_IFS
     8351  test -z "$as_dir" && as_dir=.
     8352    for ac_exec_ext in '' $ac_executable_extensions; do
     8353  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8354    ac_cv_prog_AS="${ac_tool_prefix}as"
     8355    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8356    break 2
     8357  fi
     8358done
     8359  done
     8360IFS=$as_save_IFS
     8361
     8362fi
     8363fi
     8364AS=$ac_cv_prog_AS
     8365if test -n "$AS"; then
     8366  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
     8367$as_echo "$AS" >&6; }
     8368else
     8369  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8370$as_echo "no" >&6; }
     8371fi
     8372
     8373
     8374fi
     8375if test -z "$ac_cv_prog_AS"; then
     8376  ac_ct_AS=$AS
     8377  # Extract the first word of "as", so it can be a program name with args.
     8378set dummy as; ac_word=$2
     8379{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8380$as_echo_n "checking for $ac_word... " >&6; }
     8381if ${ac_cv_prog_ac_ct_AS+:} false; then :
     8382  $as_echo_n "(cached) " >&6
     8383else
     8384  if test -n "$ac_ct_AS"; then
     8385  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
     8386else
     8387as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8388for as_dir in $PATH
     8389do
     8390  IFS=$as_save_IFS
     8391  test -z "$as_dir" && as_dir=.
     8392    for ac_exec_ext in '' $ac_executable_extensions; do
     8393  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8394    ac_cv_prog_ac_ct_AS="as"
     8395    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8396    break 2
     8397  fi
     8398done
     8399  done
     8400IFS=$as_save_IFS
     8401
     8402fi
     8403fi
     8404ac_ct_AS=$ac_cv_prog_ac_ct_AS
     8405if test -n "$ac_ct_AS"; then
     8406  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
     8407$as_echo "$ac_ct_AS" >&6; }
     8408else
     8409  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8410$as_echo "no" >&6; }
     8411fi
     8412
     8413  if test "x$ac_ct_AS" = x; then
     8414    AS="false"
     8415  else
     8416    case $cross_compiling:$ac_tool_warned in
     8417yes:)
     8418{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     8419$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     8420ac_tool_warned=yes ;;
     8421esac
     8422    AS=$ac_ct_AS
     8423  fi
     8424else
     8425  AS="$ac_cv_prog_AS"
     8426fi
     8427
     8428  if test -n "$ac_tool_prefix"; then
     8429  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
     8430set dummy ${ac_tool_prefix}dlltool; ac_word=$2
     8431{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8432$as_echo_n "checking for $ac_word... " >&6; }
     8433if ${ac_cv_prog_DLLTOOL+:} false; then :
     8434  $as_echo_n "(cached) " >&6
     8435else
     8436  if test -n "$DLLTOOL"; then
     8437  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
     8438else
     8439as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8440for as_dir in $PATH
     8441do
     8442  IFS=$as_save_IFS
     8443  test -z "$as_dir" && as_dir=.
     8444    for ac_exec_ext in '' $ac_executable_extensions; do
     8445  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8446    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     8447    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8448    break 2
     8449  fi
     8450done
     8451  done
     8452IFS=$as_save_IFS
     8453
     8454fi
     8455fi
     8456DLLTOOL=$ac_cv_prog_DLLTOOL
     8457if test -n "$DLLTOOL"; then
     8458  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
     8459$as_echo "$DLLTOOL" >&6; }
     8460else
     8461  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8462$as_echo "no" >&6; }
     8463fi
     8464
     8465
     8466fi
     8467if test -z "$ac_cv_prog_DLLTOOL"; then
     8468  ac_ct_DLLTOOL=$DLLTOOL
     8469  # Extract the first word of "dlltool", so it can be a program name with args.
     8470set dummy dlltool; ac_word=$2
     8471{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8472$as_echo_n "checking for $ac_word... " >&6; }
     8473if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
     8474  $as_echo_n "(cached) " >&6
     8475else
     8476  if test -n "$ac_ct_DLLTOOL"; then
     8477  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
     8478else
     8479as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8480for as_dir in $PATH
     8481do
     8482  IFS=$as_save_IFS
     8483  test -z "$as_dir" && as_dir=.
     8484    for ac_exec_ext in '' $ac_executable_extensions; do
     8485  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8486    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     8487    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8488    break 2
     8489  fi
     8490done
     8491  done
     8492IFS=$as_save_IFS
     8493
     8494fi
     8495fi
     8496ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
     8497if test -n "$ac_ct_DLLTOOL"; then
     8498  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
     8499$as_echo "$ac_ct_DLLTOOL" >&6; }
     8500else
     8501  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8502$as_echo "no" >&6; }
     8503fi
     8504
     8505  if test "x$ac_ct_DLLTOOL" = x; then
     8506    DLLTOOL="false"
     8507  else
     8508    case $cross_compiling:$ac_tool_warned in
     8509yes:)
     8510{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     8511$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     8512ac_tool_warned=yes ;;
     8513esac
     8514    DLLTOOL=$ac_ct_DLLTOOL
     8515  fi
     8516else
     8517  DLLTOOL="$ac_cv_prog_DLLTOOL"
     8518fi
     8519
     8520  if test -n "$ac_tool_prefix"; then
     8521  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
     8522set dummy ${ac_tool_prefix}objdump; ac_word=$2
     8523{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8524$as_echo_n "checking for $ac_word... " >&6; }
     8525if ${ac_cv_prog_OBJDUMP+:} false; then :
     8526  $as_echo_n "(cached) " >&6
     8527else
     8528  if test -n "$OBJDUMP"; then
     8529  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
     8530else
     8531as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8532for as_dir in $PATH
     8533do
     8534  IFS=$as_save_IFS
     8535  test -z "$as_dir" && as_dir=.
     8536    for ac_exec_ext in '' $ac_executable_extensions; do
     8537  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8538    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     8539    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8540    break 2
     8541  fi
     8542done
     8543  done
     8544IFS=$as_save_IFS
     8545
     8546fi
     8547fi
     8548OBJDUMP=$ac_cv_prog_OBJDUMP
     8549if test -n "$OBJDUMP"; then
     8550  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
     8551$as_echo "$OBJDUMP" >&6; }
     8552else
     8553  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8554$as_echo "no" >&6; }
     8555fi
     8556
     8557
     8558fi
     8559if test -z "$ac_cv_prog_OBJDUMP"; then
     8560  ac_ct_OBJDUMP=$OBJDUMP
     8561  # Extract the first word of "objdump", so it can be a program name with args.
     8562set dummy objdump; ac_word=$2
     8563{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8564$as_echo_n "checking for $ac_word... " >&6; }
     8565if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
     8566  $as_echo_n "(cached) " >&6
     8567else
     8568  if test -n "$ac_ct_OBJDUMP"; then
     8569  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
     8570else
     8571as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8572for as_dir in $PATH
     8573do
     8574  IFS=$as_save_IFS
     8575  test -z "$as_dir" && as_dir=.
     8576    for ac_exec_ext in '' $ac_executable_extensions; do
     8577  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8578    ac_cv_prog_ac_ct_OBJDUMP="objdump"
     8579    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8580    break 2
     8581  fi
     8582done
     8583  done
     8584IFS=$as_save_IFS
     8585
     8586fi
     8587fi
     8588ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
     8589if test -n "$ac_ct_OBJDUMP"; then
     8590  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
     8591$as_echo "$ac_ct_OBJDUMP" >&6; }
     8592else
     8593  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8594$as_echo "no" >&6; }
     8595fi
     8596
     8597  if test "x$ac_ct_OBJDUMP" = x; then
     8598    OBJDUMP="false"
     8599  else
     8600    case $cross_compiling:$ac_tool_warned in
     8601yes:)
     8602{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     8603$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     8604ac_tool_warned=yes ;;
     8605esac
     8606    OBJDUMP=$ac_ct_OBJDUMP
     8607  fi
     8608else
     8609  OBJDUMP="$ac_cv_prog_OBJDUMP"
     8610fi
     8611
     8612  ;;
     8613esac
     8614
     8615test -z "$AS" && AS=as
     8616
     8617
     8618
     8619
     8620
     8621test -z "$DLLTOOL" && DLLTOOL=dlltool
     8622
     8623
     8624
     8625
     8626
     8627test -z "$OBJDUMP" && OBJDUMP=objdump
     8628
     8629
     8630
     8631
    83378632
    83388633
     
    83408635        enable_dlopen=no
    83418636
    8342 
    8343   enable_win32_dll=no
    83448637
    83458638
     
    1803418327
    1803518328
    18036 { $as_echo "$as_me:${as_lineno-$LINENO}: additional C preprocessor flags: $MY_DEFS" >&5
    18037 $as_echo "$as_me: additional C preprocessor flags: $MY_DEFS" >&6;}
    18038 { $as_echo "$as_me:${as_lineno-$LINENO}: additional Fortran preprocessor flags: $MY_FDEFS" >&5
    18039 $as_echo "$as_me: additional Fortran preprocessor flags: $MY_FDEFS" >&6;}
    18040 
    18041 ac_config_files="$ac_config_files Makefile coinmumps.pc"
    18042 
    18043 
    1804418329
    1804518330   if test "$BUILDTOOLS_DEBUG" = 1 ; then
     
    1809018375$as_echo "$as_me: MUMPS_CFLAGS: \"${MUMPS_CFLAGS}\"" >&6;}
    1809118376      fi
     18377
     18378
     18379
     18380# if libexport_attribute is set by COIN_FINALIZE_FLAGS to __declspec(dllimport)
     18381# then we want to use MUMPS_CALL=__declspec(dllexport) when building Mumps
     18382# and users should use __declspec(dllimport), but the parenthesis are difficult
     18383# to pass on via compiler flags
     18384# so also create and install our own version of mumps_compat.h instead
     18385if test "$libexport_attribute" = "__declspec(dllimport)" ; then
     18386  MY_DEFS="$MY_DEFS -DMUMPS_CALL=\"__declspec(dllexport)\""
     18387fi
     18388
     18389cat >>confdefs.h <<_ACEOF
     18390#define MUMPS_CALL $libexport_attribute
     18391_ACEOF
     18392
     18393
     18394{ $as_echo "$as_me:${as_lineno-$LINENO}: additional C preprocessor flags: $MY_DEFS" >&5
     18395$as_echo "$as_me: additional C preprocessor flags: $MY_DEFS" >&6;}
     18396{ $as_echo "$as_me:${as_lineno-$LINENO}: additional Fortran preprocessor flags: $MY_FDEFS" >&5
     18397$as_echo "$as_me: additional Fortran preprocessor flags: $MY_FDEFS" >&6;}
     18398
     18399ac_config_files="$ac_config_files Makefile coinmumps.pc"
     18400
     18401ac_config_headers="$ac_config_headers config.h mumps_compat.h"
    1809218402
    1809318403
     
    1818318493test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
    1818418494
    18185 # Transform confdefs.h into DEFS.
    18186 # Protect against shell expansion while executing Makefile rules.
    18187 # Protect against Makefile macro expansion.
    18188 #
    18189 # If the first sed substitution is executed (which looks for macros that
    18190 # take arguments), then branch to the quote section.  Otherwise,
    18191 # look for a macro that doesn't take arguments.
    18192 ac_script='
    18193 :mline
    18194 /\\$/{
    18195  N
    18196  s,\\\n,,
    18197  b mline
    18198 }
    18199 t clear
    18200 :clear
    18201 s/^[     ]*#[    ]*define[       ][      ]*\([^  (][^    (]*([^)]*)\)[   ]*\(.*\)/-D\1=\2/g
    18202 t quote
    18203 s/^[     ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)/-D\1=\2/g
    18204 t quote
    18205 b any
    18206 :quote
    18207 s/[      `~#$^&*(){}\\|;'\''"<>?]/\\&/g
    18208 s/\[/\\&/g
    18209 s/\]/\\&/g
    18210 s/\$/$$/g
    18211 H
    18212 :any
    18213 ${
    18214         g
    18215         s/^\n//
    18216         s/\n/ /g
    18217         p
    18218 }
    18219 '
    18220 DEFS=`sed -n "$ac_script" confdefs.h`
    18221 
     18495DEFS=-DHAVE_CONFIG_H
    1822218496
    1822318497ac_libobjs=
     
    1869718971esac
    1869818972
     18973case $ac_config_headers in *"
     18974"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
     18975esac
    1869918976
    1870018977
     
    1870218979# Files that config.status was made for.
    1870318980config_files="$ac_config_files"
     18981config_headers="$ac_config_headers"
    1870418982config_commands="$ac_config_commands"
    1870518983
     
    1872319001      --file=FILE[:TEMPLATE]
    1872419002                   instantiate the configuration file FILE
     19003      --header=FILE[:TEMPLATE]
     19004                   instantiate the configuration header FILE
    1872519005
    1872619006Configuration files:
    1872719007$config_files
     19008
     19009Configuration headers:
     19010$config_headers
    1872819011
    1872919012Configuration commands:
     
    1879419077    as_fn_append CONFIG_FILES " '$ac_optarg'"
    1879519078    ac_need_defaults=false;;
    18796   --he | --h |  --help | --hel | -h )
     19079  --header | --heade | --head | --hea )
     19080    $ac_shift
     19081    case $ac_optarg in
     19082    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     19083    esac
     19084    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     19085    ac_need_defaults=false;;
     19086  --he | --h)
     19087    # Conflict between --help and --header
     19088    as_fn_error $? "ambiguous option: \`$1'
     19089Try \`$0 --help' for more information.";;
     19090  --help | --hel | -h )
    1879719091    $as_echo "$ac_cs_usage"; exit ;;
    1879819092  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     
    1885919153enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    1886019154pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
     19155AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
     19156DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
     19157OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
    1886119158enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    1886219159enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
     
    1888919186reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
    1889019187reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
    18891 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
    1889219188deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
    1889319189file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
    1889419190file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
    1889519191want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
    18896 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
    1889719192sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
    1889819193AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
     
    1905819353
    1905919354# Quote evaled strings.
    19060 for var in SHELL \
     19355for var in AS \
     19356DLLTOOL \
     19357OBJDUMP \
     19358SHELL \
    1906119359ECHO \
    1906219360PATH_SEPARATOR \
     
    1907119369lt_NL2SP \
    1907219370reload_flag \
    19073 OBJDUMP \
    1907419371deplibs_check_method \
    1907519372file_magic_cmd \
    1907619373file_magic_glob \
    1907719374want_nocaseglob \
    19078 DLLTOOL \
    1907919375sharedlib_from_linklib_cmd \
    1908019376AR \
     
    1924219538    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    1924319539    "coinmumps.pc") CONFIG_FILES="$CONFIG_FILES coinmumps.pc" ;;
     19540    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     19541    "mumps_compat.h") CONFIG_HEADERS="$CONFIG_HEADERS mumps_compat.h" ;;
    1924419542
    1924519543  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
     
    1925419552if $ac_need_defaults; then
    1925519553  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
     19554  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
    1925619555  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
    1925719556fi
     
    1944219741fi # test -n "$CONFIG_FILES"
    1944319742
    19444 
    19445 eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
     19743# Set up the scripts for CONFIG_HEADERS section.
     19744# No need to generate them if there are no CONFIG_HEADERS.
     19745# This happens for instance with `./config.status Makefile'.
     19746if test -n "$CONFIG_HEADERS"; then
     19747cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
     19748BEGIN {
     19749_ACEOF
     19750
     19751# Transform confdefs.h into an awk script `defines.awk', embedded as
     19752# here-document in config.status, that substitutes the proper values into
     19753# config.h.in to produce config.h.
     19754
     19755# Create a delimiter string that does not exist in confdefs.h, to ease
     19756# handling of long lines.
     19757ac_delim='%!_!# '
     19758for ac_last_try in false false :; do
     19759  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
     19760  if test -z "$ac_tt"; then
     19761    break
     19762  elif $ac_last_try; then
     19763    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
     19764  else
     19765    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
     19766  fi
     19767done
     19768
     19769# For the awk script, D is an array of macro values keyed by name,
     19770# likewise P contains macro parameters if any.  Preserve backslash
     19771# newline sequences.
     19772
     19773ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
     19774sed -n '
     19775s/.\{148\}/&'"$ac_delim"'/g
     19776t rset
     19777:rset
     19778s/^[     ]*#[    ]*define[       ][      ]*/ /
     19779t def
     19780d
     19781:def
     19782s/\\$//
     19783t bsnl
     19784s/["\\]/\\&/g
     19785s/^ \('"$ac_word_re"'\)\(([^()]*)\)[     ]*\(.*\)/P["\1"]="\2"\
     19786D["\1"]=" \3"/p
     19787s/^ \('"$ac_word_re"'\)[         ]*\(.*\)/D["\1"]=" \2"/p
     19788d
     19789:bsnl
     19790s/["\\]/\\&/g
     19791s/^ \('"$ac_word_re"'\)\(([^()]*)\)[     ]*\(.*\)/P["\1"]="\2"\
     19792D["\1"]=" \3\\\\\\n"\\/p
     19793t cont
     19794s/^ \('"$ac_word_re"'\)[         ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
     19795t cont
     19796d
     19797:cont
     19798n
     19799s/.\{148\}/&'"$ac_delim"'/g
     19800t clear
     19801:clear
     19802s/\\$//
     19803t bsnlc
     19804s/["\\]/\\&/g; s/^/"/; s/$/"/p
     19805d
     19806:bsnlc
     19807s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
     19808b cont
     19809' <confdefs.h | sed '
     19810s/'"$ac_delim"'/"\\\
     19811"/g' >>$CONFIG_STATUS || ac_write_fail=1
     19812
     19813cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     19814  for (key in D) D_is_set[key] = 1
     19815  FS = ""
     19816}
     19817/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
     19818  line = \$ 0
     19819  split(line, arg, " ")
     19820  if (arg[1] == "#") {
     19821    defundef = arg[2]
     19822    mac1 = arg[3]
     19823  } else {
     19824    defundef = substr(arg[1], 2)
     19825    mac1 = arg[2]
     19826  }
     19827  split(mac1, mac2, "(") #)
     19828  macro = mac2[1]
     19829  prefix = substr(line, 1, index(line, defundef) - 1)
     19830  if (D_is_set[macro]) {
     19831    # Preserve the white space surrounding the "#".
     19832    print prefix "define", macro P[macro] D[macro]
     19833    next
     19834  } else {
     19835    # Replace #undef with comments.  This is necessary, for example,
     19836    # in the case of _POSIX_SOURCE, which is predefined and required
     19837    # on some systems where configure will not decide to define it.
     19838    if (defundef == "undef") {
     19839      print "/*", prefix defundef, macro, "*/"
     19840      next
     19841    }
     19842  }
     19843}
     19844{ print }
     19845_ACAWK
     19846_ACEOF
     19847cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
     19848  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
     19849fi # test -n "$CONFIG_HEADERS"
     19850
     19851
     19852eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
    1944619853shift
    1944719854for ac_tag
     
    1966220069  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    1966320070 ;;
    19664 
     20071  :H)
     20072  #
     20073  # CONFIG_HEADER
     20074  #
     20075  if test x"$ac_file" != x-; then
     20076    {
     20077      $as_echo "/* $configure_input  */" \
     20078      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     20079    } >"$ac_tmp/config.h" \
     20080      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     20081    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
     20082      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
     20083$as_echo "$as_me: $ac_file is unchanged" >&6;}
     20084    else
     20085      rm -f "$ac_file"
     20086      mv "$ac_tmp/config.h" "$ac_file" \
     20087        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     20088    fi
     20089  else
     20090    $as_echo "/* $configure_input  */" \
     20091      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
     20092      || as_fn_error $? "could not create -" "$LINENO" 5
     20093  fi
     20094# Compute "$ac_file"'s index in $config_headers.
     20095_am_arg="$ac_file"
     20096_am_stamp_count=1
     20097for _am_header in $config_headers :; do
     20098  case $_am_header in
     20099    $_am_arg | $_am_arg:* )
     20100      break ;;
     20101    * )
     20102      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
     20103  esac
     20104done
     20105echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
     20106$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     20107         X"$_am_arg" : 'X\(//\)[^/]' \| \
     20108         X"$_am_arg" : 'X\(//\)$' \| \
     20109         X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
     20110$as_echo X"$_am_arg" |
     20111    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
     20112            s//\1/
     20113            q
     20114          }
     20115          /^X\(\/\/\)[^/].*/{
     20116            s//\1/
     20117            q
     20118          }
     20119          /^X\(\/\/\)$/{
     20120            s//\1/
     20121            q
     20122          }
     20123          /^X\(\/\).*/{
     20124            s//\1/
     20125            q
     20126          }
     20127          s/.*/./; q'`/stamp-h$_am_stamp_count
     20128 ;;
    1966520129
    1966620130  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
     
    1982720291pic_mode=$pic_mode
    1982820292
     20293# Assembler program.
     20294AS=$lt_AS
     20295
     20296# DLL creation program.
     20297DLLTOOL=$lt_DLLTOOL
     20298
     20299# Object dumper program.
     20300OBJDUMP=$lt_OBJDUMP
     20301
    1982920302# Whether or not to build shared libraries.
    1983020303build_libtool_libs=$enable_shared
     
    1990020373to_tool_file_cmd=$lt_cv_to_tool_file_cmd
    1990120374
    19902 # An object symbol dumper.
    19903 OBJDUMP=$lt_OBJDUMP
    19904 
    1990520375# Method to check whether dependent libraries are shared objects.
    1990620376deplibs_check_method=$lt_deplibs_check_method
     
    1991420384# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
    1991520385want_nocaseglob=$lt_want_nocaseglob
    19916 
    19917 # DLL creation program.
    19918 DLLTOOL=$lt_DLLTOOL
    1991920386
    1992020387# Command to associate shared and link libraries.
     
    2047820945             -e '/$AR x/s/.*/( cd $f_ex_an_ar_dir ; for f in `$AR -nologo -list "$f_ex_an_ar_oldlib" | tr "\\r" " "` ; do lib -nologo -extract:$f "$f_ex_an_ar_oldlib"; done ); : \\/g' \
    2047920946             -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
    20480               \
     20947             -e 's|always_export_symbols=yes|always_export_symbols=no|g' \
    2048120948         libtool > libtool.tmp
    2048220949         mv libtool.tmp libtool
  • ThirdParty/Mumps/branches/autotools-update/configure.ac

    r4019 r4020  
    3636
    3737# Initialize libtool
    38 AC_COIN_PROG_LIBTOOL(no-win32-dll)
     38AC_COIN_PROG_LIBTOOL
    3939
    4040# Add FLIBS to MUMPS_LFLAGS, so that they get into the .pc files section for static builds
     
    9898AC_SUBST(MY_FDEFS)
    9999
     100AC_COIN_FINALIZE_FLAGS([MUMPS])
     101
     102# if libexport_attribute is set by COIN_FINALIZE_FLAGS to __declspec(dllimport)
     103# then we want to use MUMPS_CALL=__declspec(dllexport) when building Mumps
     104# and users should use __declspec(dllimport), but the parenthesis are difficult
     105# to pass on via compiler flags
     106# so also create and install our own version of mumps_compat.h instead
     107if test "$libexport_attribute" = "__declspec(dllimport)" ; then
     108  MY_DEFS="$MY_DEFS -DMUMPS_CALL=\"__declspec(dllexport)\""
     109fi
     110AC_DEFINE_UNQUOTED(MUMPS_CALL, [$libexport_attribute], [Library Visibility Attribute])
     111
    100112AC_MSG_NOTICE([additional C preprocessor flags: $MY_DEFS])
    101113AC_MSG_NOTICE([additional Fortran preprocessor flags: $MY_FDEFS])
    102114
    103115AC_CONFIG_FILES([Makefile coinmumps.pc])
     116AC_CONFIG_HEADER(config.h mumps_compat.h)
    104117
    105 AC_COIN_FINALIZE_FLAGS([MUMPS])
    106118AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.