diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-12-20 17:46:05 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-12-20 17:46:05 (GMT) |
| commit | f36c94c1a58be797b09fe9bea5e5f92e68c682c3 (patch) | |
| tree | 3d32192f49fb35a1580efac3abc9d888bb2d2a33 /tkblt | |
| parent | 731d2093f9ac7e7a356c4e1b0e582731b5a3506d (diff) | |
| download | blt-f36c94c1a58be797b09fe9bea5e5f92e68c682c3.zip blt-f36c94c1a58be797b09fe9bea5e5f92e68c682c3.tar.gz blt-f36c94c1a58be797b09fe9bea5e5f92e68c682c3.tar.bz2 | |
fix CXX for windows
Diffstat (limited to 'tkblt')
| -rwxr-xr-x | tkblt/configure | 16 | ||||
| -rw-r--r-- | tkblt/configure.ac | 2 |
2 files changed, 3 insertions, 15 deletions
diff --git a/tkblt/configure b/tkblt/configure index 2f9ef25..f5401a3 100755 --- a/tkblt/configure +++ b/tkblt/configure @@ -740,7 +740,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -829,7 +828,6 @@ 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}' @@ -1082,15 +1080,6 @@ 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=* \ @@ -1228,7 +1217,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 runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1381,7 +1370,6 @@ 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] @@ -5506,7 +5494,7 @@ generic/tkbltDecls.h - vars="-lstdc++" + vars="" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then # Convert foo.lib to -lfoo for GCC. No-op if not *.lib diff --git a/tkblt/configure.ac b/tkblt/configure.ac index 4d8f5e8..6e1474f 100644 --- a/tkblt/configure.ac +++ b/tkblt/configure.ac @@ -131,7 +131,7 @@ generic/tkbltVector.h generic/tkbltDecls.h ]) TEA_ADD_INCLUDES([]) -TEA_ADD_LIBS([-lstdc++]) +TEA_ADD_LIBS([]) if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then TEA_ADD_CFLAGS([-TP -EHsc -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES]) fi |