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

configure: rework how $XTOOLLIB works

Browse source
This commit is contained in:
Jon Trulson 2019-10-28 20:04:10 -06:00
parent d674597f41
commit c44d4f24c8
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cde/configure.ac
View file

@ -171,9 +171,6 @@ AC_SUBST(XM_INCDIR, '-I$(top_builddir)/include/Xm')
AC_SUBST(CSA_INCDIR, '-I$(top_builddir)/include/csa')
AC_SUBST(SPC_INCDIR, '-I$(top_builddir)/include/SPC')
dnl JET FIXME/CHECKME
AC_SUBST(XTOOLLIB, "-lICE -lSM -lXt")
AC_ARG_ENABLE(japanese, [--build-japanese Build Japanese (default=no)])
AM_CONDITIONAL([JAPANESE], [test "build_japanese" = "yes"])
@ -245,6 +242,13 @@ AC_CHECK_LIB(tirpc, main, [TIRPCINC="-DOPT_TIRPC -I/usr/include/tirpc"; TIRPCLIB
AC_SUBST(TIRPCINC)
AC_SUBST(TIRPCLIB)
dnl Setup XTOOLLIB
XTOOLLIB=""
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_SUBST([XTOOLLIB])
dnl set CPPFLAGS, CFLAGS, and CXXFLAGS.
dnl The Autoconf manual says that these are user variables and