dtcalc: make it build

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

diff --git a/cde/configure.ac b/cde/configure.ac
index ef6a645d4bfededfa590ccc1a057694fb0207d6f..f8084b591c71c1eaf06a1c3410bf2061ba09980b 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -153,7 +153,7 @@ AM_CONDITIONAL([MIPS], [test "is_mips" = yes])
 AM_CONDITIONAL([PPC], [test "is_ppc" = yes])
 
 dnl our main libraries
-dnl we use single quotes so that $top_builder is evaluated in the makefiles,
+dnl we use single quotes so that $top_buildir is evaluated in the makefiles,
 dnl not here.
 AC_SUBST(LIBTT, '$(top_builddir)/lib/tt/lib/libtt.la')
 AC_SUBST(LIBXIN, '$(top_builddir)/lib/DtXinerama/libDtXinerama.la')
@@ -196,10 +196,13 @@ AM_CONDITIONAL([SPANISH], [test "build_spanish" = "yes"])
 RM="rm -f"
 AC_SUBST(RM)
 
+dnl these should be configurable someday...
+CDE_INSTALLATION_TOP="$ac_default_prefix"
 CDE_LOGFILES_TOP=/var/dt
 CDE_CONFIGURATION_TOP=/etc/dt
 CDE_USER_TOP=.dt
 
+AC_SUBST(CDE_INSTALLATION_TOP)
 AC_SUBST(CDE_CONFIGURATION_TOP)
 AC_SUBST(CDE_LOGFILES_TOP)
 AC_SUBST(CDE_USER_TOP)
@@ -209,16 +212,9 @@ AC_PROG_CXX
 
 AC_PROG_CPP
 
-dnl we need a real preprocessor, not gcc -E.  We will call it GENCPP.  We may
-dnl just bite the bullet and go with BSD's tradcpp here...
-CPP_PATH="`which cpp`"
-if test -z "$CPP_PATH"
-then
-   AC_MSG_ERROR([Could not find a C preprocessor (cpp).  Please install it.]);
-else
-   AC_SUBST(GENCPP, "$CPP_PATH -traditional -nostdinc", [CPP command])
-fi
-
+dnl we need a real preprocessor, not gcc -E.  We will call it GENCPP.  We will
+dnl go with BSD's tradcpp here...
+AC_SUBST(GENCPP, '$(top_builddir)/util/tradcpp/tradcpp')
 
 AM_PROG_LIBTOOL
 AC_PROG_YACC
@@ -250,10 +246,12 @@ AC_PATH_XTRA
 
 AC_FUNC_FORK
 
-dnl programs
+dnl programs with full paths
 
 AC_PATH_PROG(KSH, ksh)
+AC_PATH_PROG(XRDB, xrdb)
 
+dnl programs
 AC_CHECK_PROGS(BDFTOPCF, bdftopcf)
 AC_CHECK_PROGS(MKFONTIDR, mkfontdir)
 AC_CHECK_PROGS(GZIP, gzip)
@@ -272,12 +270,14 @@ AC_SUBST(TIRPCINC)
 AC_SUBST(TIRPCLIB)
 AC_CHECK_LIB(Xinerama, XineramaQueryScreens, ,[AC_MSG_ERROR([libXinerama not found])])
 
-dnl Setup XTOOLLIB
-XTOOLLIB=""
+dnl Setup XTOOLLIB - we do it in this specific order to avoid ordering
+dnl issues
+XTOOLLIB="$X_LIBS"
 AC_CHECK_LIB(X11, XOpenDisplay, [XTOOLLIB="-lX11"])
 AC_CHECK_LIB(Xt, XtInitialize, [XTOOLLIB="-lXt ${XTOOLLIB}"])
 AC_CHECK_LIB(ICE, IceCloseConnection, [XTOOLLIB="-lICE ${XTOOLLIB}"])
 AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"])
+AC_CHECK_LIB(Xm, XmTextSetString, [XTOOLLIB="-lXm ${XTOOLLIB}"])
 AC_SUBST([XTOOLLIB])
 
 dnl Add -DUSE_XINERAMA to SOURCE_CPP_DEFINES for now.  Eventually this
@@ -299,6 +299,9 @@ dnl All of the makefiles we need to generate go here...
 AC_CONFIG_FILES([
 Makefile
 
+util/Makefile
+util/tradcpp/Makefile
+
 lib/Makefile
 
 lib/DtXinerama/Makefile
@@ -385,6 +388,22 @@ programs/dtwm/Makefile
 programs/dtlogin/Makefile
 programs/dtlogin/config/Makefile
 
+programs/dtsession/Makefile
+
+programs/dthello/Makefile
+
+programs/dtstyle/Makefile
+
+programs/dtexec/Makefile
+
+programs/dtdbcache/Makefile
+
+programs/dticon/Makefile
+
+programs/dtterm/Makefile
+
+programs/dtcalc/Makefile
+
 ])
 
 AC_OUTPUT