From 731d2093f9ac7e7a356c4e1b0e582731b5a3506d Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 20 Dec 2019 11:40:46 -0500 Subject: fix CXX for mingw --- ds9/win/configure | 18 +++++++++++++++++- ds9/win/configure.ac | 2 ++ tkwin/configure | 18 +++++++++++++++++- tkwin/configure.ac | 2 ++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ds9/win/configure b/ds9/win/configure index 49b2d87..d29b5b4 100755 --- a/ds9/win/configure +++ b/ds9/win/configure @@ -631,6 +631,8 @@ MAKE_LIB TCL_DBGX LDFLAGS_DEFAULT CFLAGS_DEFAULT +CXXFLAGS +CXX LD_LIBRARY_PATH_VAR SHLIB_CFLAGS SHLIB_LD_LIBS @@ -857,6 +859,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -957,6 +960,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1209,6 +1213,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1346,7 +1359,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1499,6 +1512,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -12596,6 +12610,8 @@ $as_echo "no" >&6; } CXX="$CC" CXXFLAGS="$CFLAGS" + + #-------------------------------------------------------------------- # Set the default compiler switches based on the --enable-symbols option. #-------------------------------------------------------------------- diff --git a/ds9/win/configure.ac b/ds9/win/configure.ac index a0f2a92..f67960e 100644 --- a/ds9/win/configure.ac +++ b/ds9/win/configure.ac @@ -199,6 +199,8 @@ TEA_CONFIG_CFLAGS CXX="$CC" CXXFLAGS="$CFLAGS" +AC_SUBST(CXX) +AC_SUBST(CXXFLAGS) #-------------------------------------------------------------------- # Set the default compiler switches based on the --enable-symbols option. diff --git a/tkwin/configure b/tkwin/configure index 0352a99..20d1d9d 100755 --- a/tkwin/configure +++ b/tkwin/configure @@ -641,6 +641,8 @@ MAKE_LIB TCL_DBGX LDFLAGS_DEFAULT CFLAGS_DEFAULT +CXXFLAGS +CXX LD_LIBRARY_PATH_VAR SHLIB_CFLAGS SHLIB_LD_LIBS @@ -735,6 +737,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -818,6 +821,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1070,6 +1074,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1207,7 +1220,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1360,6 +1373,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -8363,6 +8377,8 @@ $as_echo "no" >&6; } CXX="$CC" CXXFLAGS="$CFLAGS" + + #-------------------------------------------------------------------- # Set the default compiler switches based on the --enable-symbols option. #-------------------------------------------------------------------- diff --git a/tkwin/configure.ac b/tkwin/configure.ac index 94367b9..3159bc1 100644 --- a/tkwin/configure.ac +++ b/tkwin/configure.ac @@ -149,6 +149,8 @@ TEA_CONFIG_CFLAGS CXX="$CC" CXXFLAGS="$CFLAGS" +AC_SUBST(CXX) +AC_SUBST(CXXFLAGS) #-------------------------------------------------------------------- # Set the default compiler switches based on the --enable-symbols option. -- cgit v0.12