cpp revisited: look for a cpp binary in various locations for use at runtime

[oweals/cde.git] / cde / configure.ac

diff --git a/cde/configure.ac b/cde/configure.ac
index 467d39cec25604782d3ea6c961a97ea04936e51a..16364ccea08513da217977c1fb38508b3499543d 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -216,8 +216,11 @@ AC_PROG_CXX
 
 AC_PROG_CPP
 
-dnl we need a real preprocessor, not gcc -E.  We will call it GENCPP.  We will
-dnl go with BSD's tradcpp here...
+dnl we need a real preprocessor, not gcc -E.  We will call it GENCPP.
+dnl We will go with BSD's tradcpp here...  This is used for
+dnl pre-processing during building of CDE - in the way imake used to
+dnl do.  This is not a replacement for cpp, used at runtime by
+dnl software such as tt_type_comp.
 AC_SUBST(GENCPP, '$(top_builddir)/util/tradcpp/tradcpp')
 
 AM_PROG_LIBTOOL
@@ -254,6 +257,13 @@ dnl programs with full paths
 
 AC_PATH_PROG(KSH, ksh)
 AC_PATH_PROG(XRDB, xrdb)
+dnl we need to use cpp for some things, like tooltalk and other
+dnl runtime uses.  So look for the system's cpp.  NOTE: this is NOT
+dnl the CPP (gcc -E) set by AC_PROG_CPP.  At this point I don't know
+dnl if we should even bother looking for that as we can't really use
+dnl it.
+AC_PATH_PROG(CPP_PROGRAM, cpp, ,
+       [/lib:/usr/bin:/usr/ccs/lib/:/usr/lib:/usr/libexec:/opt/langtools/lbin:$PATH])
 
 dnl programs
 AC_CHECK_PROGS(BDFTOPCF, bdftopcf)
@@ -261,6 +271,7 @@ AC_CHECK_PROGS(MKFONTDIR, mkfontdir)
 AC_CHECK_PROGS(GZIP, gzip)
 AC_CHECK_PROGS(M4, m4)
 AC_CHECK_PROGS(RPCGEN, rpcgen)
+AC_CHECK_PROGS(GENCAT, gencat)
 
 dnl headers
 AC_HEADER_STDC
@@ -362,6 +373,8 @@ programs/Makefile
 
 programs/backdrops/Makefile
 
+programs/palettes/Makefile
+
 programs/icons/Makefile
 
 programs/dthelp/Makefile
@@ -476,14 +489,39 @@ programs/localized/Makefile
 programs/localized/util/Makefile
 programs/localized/C/Makefile
 programs/localized/C/app-defaults/Makefile
+programs/localized/C/config/Makefile
+programs/localized/C/backdrops/Makefile
+programs/localized/C/types/Makefile
+programs/localized/C/palettes/Makefile
+programs/localized/C/msg/Makefile
 programs/localized/de_DE.UTF-8/Makefile
 programs/localized/de_DE.UTF-8/app-defaults/Makefile
+programs/localized/de_DE.UTF-8/config/Makefile
+programs/localized/de_DE.UTF-8/backdrops/Makefile
+programs/localized/de_DE.UTF-8/types/Makefile
+programs/localized/de_DE.UTF-8/palettes/Makefile
+programs/localized/de_DE.UTF-8/msg/Makefile
 programs/localized/fr_FR.UTF-8/Makefile
 programs/localized/fr_FR.UTF-8/app-defaults/Makefile
+programs/localized/fr_FR.UTF-8/config/Makefile
+programs/localized/fr_FR.UTF-8/backdrops/Makefile
+programs/localized/fr_FR.UTF-8/types/Makefile
+programs/localized/fr_FR.UTF-8/palettes/Makefile
+programs/localized/fr_FR.UTF-8/msg/Makefile
 programs/localized/it_IT.UTF-8/Makefile
 programs/localized/it_IT.UTF-8/app-defaults/Makefile
+programs/localized/it_IT.UTF-8/config/Makefile
+programs/localized/it_IT.UTF-8/backdrops/Makefile
+programs/localized/it_IT.UTF-8/types/Makefile
+programs/localized/it_IT.UTF-8/palettes/Makefile
+programs/localized/it_IT.UTF-8/msg/Makefile
 programs/localized/es_ES.UTF-8/Makefile
 programs/localized/es_ES.UTF-8/app-defaults/Makefile
+programs/localized/es_ES.UTF-8/config/Makefile
+programs/localized/es_ES.UTF-8/backdrops/Makefile
+programs/localized/es_ES.UTF-8/types/Makefile
+programs/localized/es_ES.UTF-8/palettes/Makefile
+programs/localized/es_ES.UTF-8/msg/Makefile
 
 ])