summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2015-08-12 20:56:53 (GMT)
committerjoye <joye>2015-08-12 20:56:53 (GMT)
commit94e98aad37bcf4f1b2040981b0ece79bb73a73f3 (patch)
treed147cc115092e5bf032f15499745d19a00eff4ed
parent0b48ba2c05f5f571548cb637baa57631033aba83 (diff)
downloadblt-94e98aad37bcf4f1b2040981b0ece79bb73a73f3.zip
blt-94e98aad37bcf4f1b2040981b0ece79bb73a73f3.tar.gz
blt-94e98aad37bcf4f1b2040981b0ece79bb73a73f3.tar.bz2
*** empty log message ***
-rwxr-xr-xMakefile.in7
-rw-r--r--tclconfig/tcl.m41
2 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index dab9c21..5f0401e 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,7 +96,6 @@ INSTALL_LIBRARY = ${INSTALL} -m 644
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
CC = @CC@
-CXX = @CXX@
CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
CFLAGS_WARNING = @CFLAGS_WARNING@
EXEEXT = @EXEEXT@
@@ -166,7 +165,7 @@ CPPFLAGS = @CPPFLAGS@
LIBS = @PKG_LIBS@ @LIBS@
AR = @AR@
CFLAGS = @CFLAGS@
-COMPILE = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
.SUFFIXES: .c .C .$(OBJEXT)
@@ -298,10 +297,10 @@ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macosx
.c.@OBJEXT@:
- $(CC) $(COMPILE) -c `@CYGPATH@ $<` -o $@
+ $(COMPILE) -c `@CYGPATH@ $<` -o $@
.C.@OBJEXT@:
- $(CXX) $(COMPILE) -c `@CYGPATH@ $<` -o $@
+ $(COMPILE) -c `@CYGPATH@ $<` -o $@
#========================================================================
# Distribution creation
diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4
index 1cd2dbf..c641fe0 100644
--- a/tclconfig/tcl.m4
+++ b/tclconfig/tcl.m4
@@ -3200,7 +3200,6 @@ AC_DEFUN([TEA_SETUP_COMPILER_CC], [
# in this macro, they need to go into TEA_SETUP_COMPILER instead.
AC_PROG_CC
- AC_PROG_CXX
AC_PROG_CPP
INSTALL="\$(SHELL) \$(srcdir)/tclconfig/install-sh -c"