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: rework libXinerama detection a bit, remove hardcoded -lXinerama's

Browse source 
Make -lXinerama a dep on libDtXinerama so it doen't need to be
specified in Makefile.am files or in LIBS as it was being done
previously.

This still needs a little work, ideally Xinerama should be completely
optional and only enabled if present.  But we can save that for
later.
This commit is contained in:
Jon Trulson 2019-11-21 14:14:59 -07:00
parent b71a319133
commit afabfd8bd7
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cde/configure.ac
View file

@ -265,8 +265,10 @@ AC_CHECK_HEADERS([locale.h])
dnl libraries dnl libraries
AC_CHECK_LIB(m, cosf) AC_CHECK_LIB(m, cosf)
AC_CHECK_LIB(crypt, crypt) AC_CHECK_LIB(crypt, crypt)
AC_CHECK_LIB(Xinerama, XineramaQueryScreens, , dnl this should be configurable, for now it is required
[AC_MSG_ERROR([libXinerama not found])]) AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
[SOURCE_CPP_DEFINES="${SOURCE_CPP_DEFINES} -DUSE_XINERAMA"],
[AC_MSG_ERROR([libXinerama not found])])
dnl Special check for tirpc... dnl Special check for tirpc...
AC_CHECK_LIB(tirpc, svc_register, AC_CHECK_LIB(tirpc, svc_register,
@ -285,10 +287,6 @@ AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"])
AC_CHECK_LIB(Xm, XmTextSetString, [XTOOLLIB="-lXm ${XTOOLLIB}"]) AC_CHECK_LIB(Xm, XmTextSetString, [XTOOLLIB="-lXm ${XTOOLLIB}"])
AC_SUBST([XTOOLLIB]) AC_SUBST([XTOOLLIB])
dnl Add -DUSE_XINERAMA to SOURCE_CPP_DEFINES for now. Eventually this
dnl should be configurable.
SOURCE_CPP_DEFINES="${SOURCE_CPP_DEFINES} -DUSE_XINERAMA"
dnl set CPPFLAGS, CFLAGS, and CXXFLAGS. dnl set CPPFLAGS, CFLAGS, and CXXFLAGS.
dnl The Autoconf manual says that these are user variables and dnl The Autoconf manual says that these are user variables and
dnl shouldn't be modified. It suggests that you create a special dnl shouldn't be modified. It suggests that you create a special

3
cde/programs/dtmail/dtmailpr/Makefile.am
View file

@ -5,8 +5,7 @@ bin_PROGRAMS = dtmailpr
dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \ dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \
-I$(srcdir)/lib -I$(srcdir)/lib
dtmailpr_LDADD = ../libDtMail/libDtMail.a @DTCLIENTLIBS@ \ dtmailpr_LDADD = ../libDtMail/libDtMail.a $(DTCLIENTLIBS) $(XTOOLLIB)
-lXm @LIBXIN@ -lXinerama $(XTOOLLIB) ${X_LIBS} $(TIRPCLIB)
if FREEBSD if FREEBSD
dtmailpr_LDADD += -liconv dtmailpr_LDADD += -liconv