Merge branch 'master' into autotools-conversion

2019-12-01 13:31:21 -07:00
parent 081b6c8765 5cebd7c4da
commit e481f4cb93
5 changed files with 12 additions and 19 deletions
--- a/cde/lib/tt/bin/tt_type_comp/Imakefile
+++ b/cde/lib/tt/bin/tt_type_comp/Imakefile
@@ -8,7 +8,9 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)

 #include "../../tooltalk.tmpl"

-DEFINES = 
+CPP_PROGRAM = CppCmd
+CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
+DEFINES = $(CPP_DEFINES)
 INCLUDES = $(TIRPCINC) -I../../lib -I../../slib

 DEPLIBS         = ../../slib/libstt.a TtClientDepLibs
--- a/cde/lib/tt/lib/tt_options.h
+++ b/cde/lib/tt/lib/tt_options.h
@@ -529,4 +529,9 @@

 #endif

+#ifdef CPP_PROGRAM
+# undef OPT_CPP_PATH
+# define OPT_CPP_PATH CPP_PROGRAM
+#endif
+
 #endif				/* _TT_OPTIONS_H */