diff options
| -rw-r--r-- | ds9/macos/Makefile.in | 2 | ||||
| -rwxr-xr-x | ds9/macos/configure | 12 | ||||
| -rw-r--r-- | ds9/macos/configure.ac | 2 | ||||
| -rw-r--r-- | ds9/unix/Makefile.in | 2 | ||||
| -rwxr-xr-x | ds9/unix/configure | 12 | ||||
| -rw-r--r-- | ds9/unix/configure.ac | 2 | ||||
| -rwxr-xr-x | ds9/win/configure | 14 | ||||
| -rwxr-xr-x | tcliis/configure | 2 | ||||
| -rw-r--r-- | tcliis/configure.ac | 2 | ||||
| -rwxr-xr-x | tkagif/configure | 2 | ||||
| -rw-r--r-- | tkagif/configure.ac | 2 | ||||
| -rwxr-xr-x | tkblt/configure | 16 | ||||
| -rw-r--r-- | tkblt/configure.ac | 2 | ||||
| -rwxr-xr-x | tkmacosx/configure | 2 | ||||
| -rw-r--r-- | tkmacosx/configure.ac | 2 | ||||
| -rwxr-xr-x | tkmpeg/configure | 2 | ||||
| -rw-r--r-- | tkmpeg/configure.ac | 2 | ||||
| -rwxr-xr-x | tksao/configure | 2 | ||||
| -rw-r--r-- | tksao/configure.ac | 2 | ||||
| -rwxr-xr-x | tkwin/configure | 16 | ||||
| -rw-r--r-- | tkwin/configure.ac | 2 |
21 files changed, 23 insertions, 79 deletions
diff --git a/ds9/macos/Makefile.in b/ds9/macos/Makefile.in index d26fb33..e5f8486 100644 --- a/ds9/macos/Makefile.in +++ b/ds9/macos/Makefile.in @@ -175,7 +175,7 @@ tkAppInit.c : $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c ds9base : $(OBJS) $(LLIBS) $(RM) $@ - $(CC) $(CFLAGS) -o $@ \ + $(CXX) $(CFLAGS) -o $@ \ $(OBJS) \ $(LLIBS) \ -L $(prefix)/openssl -lssl -lcrypto \ diff --git a/ds9/macos/configure b/ds9/macos/configure index e652341..7ea1070 100755 --- a/ds9/macos/configure +++ b/ds9/macos/configure @@ -10038,17 +10038,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu #TEA_ADD_SOURCES([sample.c tclsample.c]) #TEA_ADD_HEADERS([]) #TEA_ADD_INCLUDES([]) - - vars="-lstdc++" - 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 - i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` - fi - PKG_LIBS="$PKG_LIBS $i" - done - - +#TEA_ADD_LIBS() #TEA_ADD_CFLAGS([]) #TEA_ADD_STUB_SOURCES([]) #TEA_ADD_TCL_SOURCES([]) diff --git a/ds9/macos/configure.ac b/ds9/macos/configure.ac index bd00ef0..7d969d5 100644 --- a/ds9/macos/configure.ac +++ b/ds9/macos/configure.ac @@ -133,7 +133,7 @@ AC_PROG_CXX #TEA_ADD_SOURCES([sample.c tclsample.c]) #TEA_ADD_HEADERS([]) #TEA_ADD_INCLUDES([]) -TEA_ADD_LIBS([-lstdc++]) +#TEA_ADD_LIBS() #TEA_ADD_CFLAGS([]) #TEA_ADD_STUB_SOURCES([]) #TEA_ADD_TCL_SOURCES([]) diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index 740fefc..83253e6 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -176,7 +176,7 @@ endif ds9base : $(OBJS) $(LLIBS) $(RM) $@ - $(CC) $(CFLAGS) -o $@ \ + $(CXX) $(CFLAGS) -o $@ \ $(OBJS) \ $(LLIBS) \ -L $(prefix)/openssl -lssl -lcrypto \ diff --git a/ds9/unix/configure b/ds9/unix/configure index 00fc7a0..1555107 100755 --- a/ds9/unix/configure +++ b/ds9/unix/configure @@ -10039,17 +10039,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu #TEA_ADD_SOURCES([sample.c tclsample.c]) #TEA_ADD_HEADERS([]) #TEA_ADD_INCLUDES([]) - - vars="-lstdc++" - 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 - i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` - fi - PKG_LIBS="$PKG_LIBS $i" - done - - +#TEA_ADD_LIBS() #TEA_ADD_CFLAGS([]) #TEA_ADD_STUB_SOURCES([]) #TEA_ADD_TCL_SOURCES([]) diff --git a/ds9/unix/configure.ac b/ds9/unix/configure.ac index fa4b7c1..f384f8f 100644 --- a/ds9/unix/configure.ac +++ b/ds9/unix/configure.ac @@ -133,7 +133,7 @@ AC_PROG_CXX #TEA_ADD_SOURCES([sample.c tclsample.c]) #TEA_ADD_HEADERS([]) #TEA_ADD_INCLUDES([]) -TEA_ADD_LIBS([-lstdc++]) +#TEA_ADD_LIBS() #TEA_ADD_CFLAGS([]) #TEA_ADD_STUB_SOURCES([]) #TEA_ADD_TCL_SOURCES([]) diff --git a/ds9/win/configure b/ds9/win/configure index d29b5b4..62d6645 100755 --- a/ds9/win/configure +++ b/ds9/win/configure @@ -859,7 +859,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -960,7 +959,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}' @@ -1213,15 +1211,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=* \ @@ -1359,7 +1348,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. @@ -1512,7 +1501,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] diff --git a/tcliis/configure b/tcliis/configure index 36315a1..3f60f8c 100755 --- a/tcliis/configure +++ b/tcliis/configure @@ -5263,7 +5263,7 @@ fi - 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/tcliis/configure.ac b/tcliis/configure.ac index ad912d6..7818416 100644 --- a/tcliis/configure.ac +++ b/tcliis/configure.ac @@ -83,7 +83,7 @@ TEA_ADD_SOURCES([ ]) TEA_ADD_HEADERS([]) TEA_ADD_INCLUDES([]) -TEA_ADD_LIBS([-lstdc++]) +TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) TEA_ADD_TCL_SOURCES([]) diff --git a/tkagif/configure b/tkagif/configure index 893088c..2bc115a 100755 --- a/tkagif/configure +++ b/tkagif/configure @@ -5431,7 +5431,7 @@ fi - 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/tkagif/configure.ac b/tkagif/configure.ac index df3e030..6b51c57 100644 --- a/tkagif/configure.ac +++ b/tkagif/configure.ac @@ -80,7 +80,7 @@ TEA_ADD_SOURCES([ ]) TEA_ADD_HEADERS([]) TEA_ADD_INCLUDES([]) -TEA_ADD_LIBS([-lstdc++]) +TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) TEA_ADD_TCL_SOURCES([]) 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 diff --git a/tkmacosx/configure b/tkmacosx/configure index 44c13ed..f5b988a 100755 --- a/tkmacosx/configure +++ b/tkmacosx/configure @@ -5434,7 +5434,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - 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/tkmacosx/configure.ac b/tkmacosx/configure.ac index 83823a4..9ab1fa1 100644 --- a/tkmacosx/configure.ac +++ b/tkmacosx/configure.ac @@ -81,7 +81,7 @@ TEA_ADD_HEADERS([ macosxlib.h ]) TEA_ADD_INCLUDES([-I../tksao/vector]) -TEA_ADD_LIBS([-lstdc++]) +TEA_ADD_LIBS() TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) TEA_ADD_TCL_SOURCES([]) diff --git a/tkmpeg/configure b/tkmpeg/configure index db9294c..af98801 100755 --- a/tkmpeg/configure +++ b/tkmpeg/configure @@ -5432,7 +5432,7 @@ fi - 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/tkmpeg/configure.ac b/tkmpeg/configure.ac index 39612b0..c6b212a 100644 --- a/tkmpeg/configure.ac +++ b/tkmpeg/configure.ac @@ -81,7 +81,7 @@ TEA_ADD_SOURCES([ ]) TEA_ADD_HEADERS([]) TEA_ADD_INCLUDES([]) -TEA_ADD_LIBS([-lstdc++]) +TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) TEA_ADD_TCL_SOURCES([]) diff --git a/tksao/configure b/tksao/configure index 616bb67..7bb9348 100755 --- a/tksao/configure +++ b/tksao/configure @@ -5725,7 +5725,7 @@ widget/widget.C - 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/tksao/configure.ac b/tksao/configure.ac index c824bd4..1d588b1 100644 --- a/tksao/configure.ac +++ b/tksao/configure.ac @@ -276,7 +276,7 @@ widget/widget.C TEA_ADD_HEADERS([]) TEA_ADD_INCLUDES([-I. -I./colorbar -I./fitsy++ -I./frame -I./list -I./magnifier -I./panner -I./util -I./vector -I./widget -I${prefix}/include]) -TEA_ADD_LIBS([-lstdc++]) +TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) TEA_ADD_TCL_SOURCES([]) diff --git a/tkwin/configure b/tkwin/configure index 20d1d9d..efa179b 100755 --- a/tkwin/configure +++ b/tkwin/configure @@ -737,7 +737,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -821,7 +820,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}' @@ -1074,15 +1072,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=* \ @@ -1220,7 +1209,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. @@ -1373,7 +1362,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] @@ -5144,7 +5132,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.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/tkwin/configure.ac b/tkwin/configure.ac index 3159bc1..5596269 100644 --- a/tkwin/configure.ac +++ b/tkwin/configure.ac @@ -79,7 +79,7 @@ TEA_ADD_HEADERS([ win32lib.h ]) TEA_ADD_INCLUDES([-I../tksao/vector]) -TEA_ADD_LIBS([-lstdc++]) +TEA_ADD_LIBS() TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) TEA_ADD_TCL_SOURCES([]) |