external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

configure: some changes to config.h, CSRG, and XTOOLLIB impl

Browse source 
We create autotools_config.h instead of config.h to make it clear  and
avoid collisions.

We use a different method to define CSRG_BASED on BSD systems, and fix
a bug in definition of XTOOLLIB.

XTOOLLIB should probably be checked out - we should get some info from
AC_PATH_X and AC_PATH_XTRA instead of hardcoding it.  To be looked at
later.
This commit is contained in:
Jon Trulson 2019-10-24 17:10:53 -06:00
parent b4295847c6
commit a4ca695daf
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cde/configure.ac
View file

@ -1,5 +1,5 @@
AC_INIT([cde-desktop], [2.3.1], [jon@radscan.com]) AC_INIT([cde-desktop], [2.3.1], [jon@radscan.com])
AC_CONFIG_HEADERS([include/config.h]) AC_CONFIG_HEADERS([include/autotools_config.h])
AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_MACRO_DIRS([m4])
AM_INIT_AUTOMAKE([foreign]) AM_INIT_AUTOMAKE([foreign])
AC_PREFIX_DEFAULT(/usr/dt) AC_PREFIX_DEFAULT(/usr/dt)
@ -71,10 +71,8 @@ AM_CONDITIONAL([HPUX], [test "$build_hpux" = "yes"])
dnl set CSRG_BASED define for the BSD's dnl set CSRG_BASED define for the BSD's
if test "$build_bsd" = "yes" if test "$build_bsd" = "yes"
then then
oflags="$CFLAGS" oflags="$CPPFLAGS"
CFLAGS="$oflags -DCSRG_BASED" CPPFLAGS="$oflags -DCSRG_BASED"
oflags="$CXXFLAGS"
CXXFLAGS="$oflags -DCSRG_BASED"
fi fi
is_x86_64=no is_x86_64=no
@ -123,7 +121,8 @@ LIBMRM="$srcdir/lib/DtMrm/libDtMrm.so.2.1"
LIBMMDB="$srcdir/lib/DtMmdb/libDtMmdb.so.2.1" LIBMMDB="$srcdir/lib/DtMmdb/libDtMmdb.so.2.1"
LIBHELP="$srcdir/lib/DtHelp/libDtHelp.so.2.1" LIBHELP="$srcdir/lib/DtHelp/libDtHelp.so.2.1"
LIBCSA="$srcdir/lib/csa/libcsa.so.2.1" LIBCSA="$srcdir/lib/csa/libcsa.so.2.1"
XTOOLLIB=-lICE -lSM -lXt dnl JET FIXME
XTOOLLIB="-lICE -lSM -lXt"
AC_SUBST(LIBTT) AC_SUBST(LIBTT)
AC_SUBST(LIBXIN) AC_SUBST(LIBXIN)