1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

configure/Makefiles: add checks for Xmu, Xext, and Xdmcp

We also remove sun pro specific options, and do some general cleanup
as well as remove hardcoded library refs like -lXm, -lXext, etc...
This commit is contained in:
Jon Trulson 2021-12-21 11:50:20 -07:00
parent 8875a12366
commit e10d06f210
35 changed files with 45 additions and 130 deletions

View file

@ -442,12 +442,16 @@ dnl issues
XTOOLLIB=""
AC_CHECK_LIB(X11, XOpenDisplay, [XTOOLLIB="-lX11"], ,
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_CHECK_LIB(Xext, XextFindDisplay, [XTOOLLIB="-lXext ${XTOOLLIB}"], ,
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_CHECK_LIB(Xau, XauReadAuth, [XTOOLLIB="-lXau ${XTOOLLIB}"], ,
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_CHECK_LIB(Xpm, XpmLibraryVersion, [XTOOLLIB="-lXpm ${XTOOLLIB}"], ,
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_CHECK_LIB(Xt, XtInitialize, [XTOOLLIB="-lXt ${XTOOLLIB}"], ,
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_CHECK_LIB(Xmu, XmuMakeAtom, [XTOOLLIB="-lXmu ${XTOOLLIB}"], ,
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_CHECK_LIB(ICE, IceCloseConnection, [XTOOLLIB="-lICE ${XTOOLLIB}"], ,
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"], ,
@ -457,6 +461,11 @@ AC_CHECK_LIB(Xm, XmTextSetString, [XTOOLLIB="-lXm ${XTOOLLIB}"], ,
XTOOLLIB="${EXTRA_INCS} ${EXTRA_LIBS} ${X_EXTRA_LIBS} ${XTOOLLIB}"
AC_SUBST([XTOOLLIB])
dnl only needed by dtlogin
AC_CHECK_LIB(Xdmcp, XdmcpFlush, [XDMCPLIB="-lXdmcp"], [XDMCPLIB=""],
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_SUBST(XDMCPLIB)
dnl iconv
AM_ICONV

View file

@ -9,9 +9,5 @@ if SOLARIS
libDtPrint_la_CFLAGS += -DNO_REGCOMP
endif
if HPUX
libDtPrint_la_CFLAGS += -DMESSAGE_CAT
endif
libDtPrint_la_SOURCES = PrintMsgs.c PrintDlgMgr.c PrintOptions.c PrintSetupB.c \
PsubDefProc.c PsubUtil.c

View file

@ -2,10 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_LTLIBRARIES = libraima.la
libraima_la_LIBADD = -lc -lm
libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
@DT_INCDIR@ -I$(top_srcdir)/include \
$(DT_INCDIR) -I$(top_srcdir)/include \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE
@ -21,10 +19,6 @@ if SOLARIS
libraima_la_CFLAGS += -D_XOPEN_SOURCE=500 -DNO_REGCOMP
endif
if HPUX
libraima_la_CFLAGS += -DMESSAGE_CAT
endif
libraima_la_SOURCES = alloc.c cmtype.c connect.c \
cotype.c crget.c crread.c crset.c \

View file

@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_LTLIBRARIES = libTermPrim.la
AM_CPPFLAGS = @DT_INCDIR@
AM_CPPFLAGS = $(DT_INCDIR)
libTermPrim_la_SOURCES = TermPrim.c \
TermPrimAction.c \
@ -33,10 +33,6 @@ libTermPrim_la_SOURCES = TermPrim.c \
# JET there may be some more missing here...
if AIX
libTermPrim_la_SOURCES += TermPrimGetPty-clone.c
endif
if SOLARIS
libTermPrim_la_SOURCES += TermPrimGetPty-svr4.c
AM_CPPFLAGS += -DSUN_ARCHITECTURE

View file

@ -5,24 +5,15 @@ MAINTAINERCLEANFILES = Makefile.in
lib_LTLIBRARIES = libcsa.la
libcsa_la_CFLAGS = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \
@CSA_INCDIR@
$(CSA_INCDIR)
libcsa_la_LIBADD = -lXt $(TIRPCLIB)
libcsa_la_LIBADD = $(XTOOLLIB) $(TIRPCLIB)
libcsa_la_LDFLAGS = -version-info 3:0:1
if SOLARIS
libcsa_la_LDFLAGS += -G -z text -z defs
libcsa_la_CFLAGS += -v
endif
if HPUX
libcsa_la_CFLAGS += -DHPUX
endif
if LINUX
else
libcsa_la_LIBADD += $(LIBSVC) -lXm
libcsa_la_LIBADD += $(LIBSVC) $(XTOOLLIB)
endif
AM_YFLAGS = -d

View file

@ -7,7 +7,7 @@ bin_PROGRAMS = ttmv ttrm ttcp ttrmdir
AM_CXXFLAGS = -I../../lib $(TT_VERSION_DEFINE)
LDADD = @LIBTT@ $(TIRPCLIB) $(XTOOLLIB)
LDADD = $(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
LDADD += -ldl -lintl -lsocket -lnsl

View file

@ -8,7 +8,7 @@ bin_PROGRAMS = rpc.ttdbserver
rpc_ttdbserver_CXXFLAGS = -I../../slib -I../../lib -I../../mini_isam \
$(TIRPC_DEFINES) $(TT_VERSION_DEFINE)
rpc_ttdbserver_LDADD = @LIBTT@ ${TIRPCLIB} $(X_LIBS) ../../slib/libstt.a \
rpc_ttdbserver_LDADD = $(LIBTT) ${TIRPCLIB} $(X_LIBS) ../../slib/libstt.a \
../../mini_isam/libisam.a
if LINUX

View file

@ -7,7 +7,7 @@ bin_PROGRAMS = ttsession
ttsession_CXXFLAGS = -I../../slib -I../../lib $(TT_VERSION_DEFINE)
ttsession_LDADD = @LIBTT@ $(X_LIBS) ../../slib/libstt.a
ttsession_LDADD = $(LIBTT) $(X_LIBS) ../../slib/libstt.a
if LINUX
ttsession_LDADD += $(TIRPCLIB) $(XTOOLLIB)

View file

@ -8,7 +8,7 @@ bin_PROGRAMS = tttar
tttar_CXXFLAGS = -I../../lib $(TT_VERSION_DEFINE)
tttar_LDADD = ../../slib/libstt.a ../../mini_isam/libisam.a \
@LIBTT@ $(TIRPCLIB) $(XTOOLLIB)
$(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
tttar_LDADD += -ldl -lintl -lsocket -lnsl

View file

@ -4,7 +4,7 @@ bin_PROGRAMS = tttrace
tttrace_CXXFLAGS = -I../../lib
tttrace_LDADD = @LIBTT@ $(TIRPCLIB) $(XTOOLLIB)
tttrace_LDADD = $(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
tttrace_LDADD += -ldl -lintl -lsocket -lnsl

View file

@ -2,14 +2,14 @@ MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = api db mp util tttk
lib_LTLIBRARIES = libtt.la
if AIX
libtt_la_SOURCES = realpath.c
else
# if you are on a system that does not support realpath(), you may need to
# include realpath.c in the _SOURCES
#
#libtt_la_SOURCES = realpath.c
libtt_la_SOURCES =
endif
# fake things so libtool creates this as a C++ library
nodist_EXTRA_libtt_la_SOURCES = dummy.cxx

View file

@ -1,7 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
if SOLARIS
.NO_PARALLEL:
endif
SUBDIRS = src

View file

@ -1,7 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
if SOLARIS
.NO_PARALLEL:
endif
SUBDIRS = libAButil libABobj libABobjXm libABil abmf ab

View file

@ -47,7 +47,7 @@ SOURCES.msg = \
dtbuilder_LDADD = ../libABil/libABil.a ../libABobjXm/libABobjXm.a \
../libABobj/libABobj.a ../libAButil/libAButil.a \
$(LIBWIDGET) $(LIBTERM) $(LIBHELP) $(LIBSVC) \
$(LIBTT) $(LIBXIN) -lUil $(MRESOURCELIB) -lXm $(XTOOLLIB) ${X_LIB} \
$(LIBTT) $(LIBXIN) -lUil $(MRESOURCELIB) $(XTOOLLIB) ${X_LIB} \
$(UTILLIB) -lm
dtbuilder_CFLAGS = -DPIXMAP_WORKAROUND $(ABINCLUDES)

View file

@ -4,14 +4,6 @@ ABINCLUDES = ../include
EXTRA_DEFINES = -D_POSIX_SOURCE=1
if HPUX
CCOPTIONS = -Ae
endif
if AIX
CCOPTIONS = -qnoro
endif
if BSD
UTILLIB = -lutil
endif
@ -30,11 +22,11 @@ noinst_DATA = dtcodegen.cat
dtcodegen_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES) -I../libABil
dtcodegen_LDADD = -lXext ../libABil/libABil.a \
dtcodegen_LDADD = ../libABil/libABil.a \
../libABobjXm/libABobjXm.a \
../libABobj/libABobj.a ../libAButil/libAButil.a \
$(LIBTERM) $(LIBSVC) $(LIBTT) $(LIBHELP) $(LIBXIN) \
$(LIBWIDGET) $(UTILLIB) $(XTOOLLIB) -lm
$(LIBWIDGET) $(UTILLIB) $(XTOOLLIB)
dtcodegen_SOURCES = abmf.c args.c \

View file

@ -6,14 +6,6 @@ EXTRA_DEFINES = -D_POSIX_SOURCE=1
EXTRALIBS = -lm
if HPUX
CCOPTIONS = -Ae
endif
if AIX
EXTRALIBS += -liconv
endif
if SOLARIS
EXTRALIBS += -ldl -lgen
endif

View file

@ -7,10 +7,6 @@ AM_CFLAGS = $(DT_INCDIR) $(CSA_INCDIR) -I../../../lib/csa \
LDADD = ../libDtCmP/libDtCmP.a $(LIBCSA) $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
AM_CFLAGS += -xstrconst -Xc -v
endif
if FREEBSD
LDADD += -lcompat
endif

View file

@ -5,10 +5,6 @@ noinst_LIBRARIES = libDtCmP.a
libDtCmP_a_CFLAGS = $(CSA_INCDIR) -I../../../lib/csa -DRFC_MIME \
-DLINE_COUNT -DV2 -DOW_I18N
if SOLARIS
libDtCmP_a_CFLAGS += -xstrconst -Xc -v
endif
libDtCmP_a_SOURCES = cm_tty.c cmfns.c dtfns.c props.c resource.c \
timeops.c util.c getdate.y

View file

@ -7,7 +7,6 @@ rpc_cmsd_CFLAGS = -I../../../lib/csa $(DT_INCDIR) $(CSA_INCDIR)
rpc_cmsd_LDADD = $(LIBCSA) $(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
rpc_cmsd_CFLAGS += -xstrconst -Xc -v
rpc_cmsd_LDADD += -lsocket -lnsl -lintl -lm -ldl
endif

View file

@ -18,7 +18,7 @@ dtfile_CPPFLAGS = -I./dtcopy -DSHAPE -D_ILS_MACROS -DSUN_PERF \
dtfile_LDADD = dtcopy/sharedFuncs.o \
dtcopy/fsrtns.o \
$(DTCLIENTLIBS) $(TIRPCLIB) -lXm -lXext $(XTOOLLIB)
$(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB)
if OPENBSD
dtfile_CPPFLAGS += -DFILE_MAP_OPTIMIZE
@ -29,7 +29,6 @@ dtfile_CPPFLAGS += -DFILE_MAP_OPTIMIZE
endif
if SOLARIS
dtfile_CFLAGS = -xF
dtfile_LDADD += -lintl -lresolv
endif

View file

@ -4,11 +4,7 @@ bin_PROGRAMS = dtfile_copy
dtfile_copy_CFLAGS = -DSHAPE
if SOLARIS
dtfile_copy_CFLAGS += -xF
endif
dtfile_copy_LDADD = @DTCLIENTLIBS@ -lXm $(TIRPCLIB) $(XTOOLLIB)
dtfile_copy_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) $(TIRPCLIB)
dtfile_copy_SOURCES = main_dtcopy.c copydialog.c overwrtdialog.c dosync.c \
fsrtns.c utils.c errordialog.c sharedFuncs.c

View file

@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dthello
dthello_LDADD = $(DTCLIENTLIBS) ${X_LIBS} -lXm $(XTOOLLIB)
dthello_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
dthello_LDADD += -ldl -lgen

View file

@ -10,10 +10,6 @@ dtimsstart_CFLAGS = -DNLS
dtimsstart_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
if SOLARIS
dtimsstart_CFLAGS += -xF
endif
dtimsstart_SOURCES = action.c env.c file.c main.c remote.c select.c \
start.c util.c win.c ximserr.h ximsfunc.h xims.h \
ximspath.h

View file

@ -67,6 +67,6 @@ bin_PROGRAMS = dtinfo
dtinfo_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
dtinfo_LDADD = $(OLIASNORMALLIBS) $(LIBSEARCH) $(MMDB_LIBS) $(WWL_LIBS) \
$(DTCLIENTLIBS) -lXmu $(XTOOLLIB)
$(DTCLIENTLIBS) $(XTOOLLIB)
dtinfo_SOURCES = main.C Support/InputNotifier.C

View file

@ -10,10 +10,6 @@ dist_ksh_SCRIPTS = DtFuncs.dtsh
KSH93SRC = ./ksh93
if SOLARIS
.NO_PARALLEL:
endif
KSH93LIBSHELL = $(KSH93SRC)/lib/libshell.a
bin_PROGRAMS = dtksh
@ -31,9 +27,9 @@ dtksh_CPPFLAGS = -I$(KSH93SRC)/include/ast -I$(KSH93SRC)/src/cmd/ksh93/include \
-DSHOPT_SUID_EXEC -D_API_ast=20100309 -DSHOPT_BRACEPAT \
-DBUILD_DTKSH
dtksh_LDADD = $(DTCLIENTLIBS) -lXm pmain.o $(XTOOLLIB) ${X_LIB} \
dtksh_LDADD = $(DTCLIENTLIBS) pmain.o $(XTOOLLIB) \
libshell.a $(KSH93SRC)/lib/libcmd.a $(KSH93SRC)/lib/libast.a \
$(KSH93SRC)/lib/libdll.a -lm
$(KSH93SRC)/lib/libdll.a
if LINUX
dtksh_LDADD += -ldl

View file

@ -4,7 +4,7 @@ bin_PROGRAMS = dtlogin dtgreet dtchooser
if HAS_PAM_LIBRARY
PAM_LIB = -lpam
DTPAMSVCLIB = @LIBPAMSVC@
DTPAMSVCLIB = $(LIBPAMSVC)
else
PAM_LIB =
DTPAMSVCLIB =
@ -56,12 +56,12 @@ dtgreet_SOURCES = vgcallback.c vglogo.c vgmain.c vgutil.c vglang.c
dtchooser_SOURCES = chooser.c dtchooser.c vglogo.c vgutil.c vgcallback.c \
vglang.c
dtlogin_LDADD = libresource.a @DTCLIENTLIBS@ -lXau -lXmu -lXext -lXdmcp \
dtlogin_LDADD = libresource.a $(DTCLIENTLIBS) $(XDMCPLIB) \
$(XTOOLLIB) $(TIRPCLIB) $(DTPAMSVCLIB) $(PAM_LIB)
dtgreet_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
dtchooser_LDADD = $(DTCLIENTLIBS) -lXmu -lXext -lXdmcp $(XTOOLLIB)
dtchooser_LDADD = $(DTCLIENTLIBS) $(XDMCPLIB) $(XTOOLLIB)
if LINUX

View file

@ -4,21 +4,6 @@ noinst_LIBRARIES = libMotifApp.a
libMotifApp_a_CXXFLAGS = -I../include/MotifApp -I../include -I../include/utils
# FIXME - some of these aren't set and sould be by configure.ac
#if SOLARIS
#if USE_SPRO_V3
#libMotifApp_a_CXXFLAGS += -noex -xO0 -USPRO_V2
#endif
#if DEBUGTREE
#libMotifApp_a_CXXFLAGS += -xsb
#endif
#
#libMotifApp_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
#endif
libMotifApp_a_SOURCES = Application.C AskFirstCmd.C \
BasicComponent.C BusyPixmap.C \
ButtonInterface.C Cmd.C \
@ -36,8 +21,3 @@ libMotifApp_a_SOURCES = Application.C AskFirstCmd.C \
UndoCmd.C WarnNoUndoCmd.C \
WorkingDialogManager.C
if SOLARIS
clean-local:
$(RM) -r .sb
$(RM) .make.state*
endif

View file

@ -7,7 +7,7 @@ dtmail_CXXFLAGS = -I../include -I../include/MotifApp -I../include/utils \
-I$(srcdir)/lib -I../../dthelp -DRELEASE_NOTES \
-DDTMAIL_TOOLTALK -DDTEDITOR
dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a -lXm \
dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a \
$(DTCLIENTLIBS) $(XTOOLLIB) $(TIRPCLIB)
dtmail_SOURCES = AliasListUiItem.C AlternatesListUiItem.C \

View file

@ -6,7 +6,7 @@ libCommon_a_CXXFLAGS = -I../../include -I../../include/utils -I$(srcdir)/lib \
-DDL_NOT_DYNAMIC -DUSE_SOCKSTREAM
if SOLARIS
libCommon_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
libCommon_a_CXXFLAGS += -DMMAP_NORESERVE
endif
libCommon_a_SOURCES = APOPServer.C \

View file

@ -6,7 +6,7 @@ libRFC_a_CXXFLAGS = -I../Common -I../../include -I../../include/utils \
-DTTLOCK_OFF
if SOLARIS
libRFC_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
libRFC_a_CXXFLAGS += -DMMAP_NORESERVE
endif
libRFC_a_SOURCES = AliasExpand.C MIMEBodyPart.C \

View file

@ -4,10 +4,9 @@ bin_PROGRAMS = dtpad
dtpad_CFLAGS = -DDT_LITE -DWORDWRAP
dtpad_LDADD = @DTCLIENTLIBS@ -lXm $(TIRPCLIB) $(XTOOLLIB)
dtpad_LDADD = $(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
dtpad_CFLAGS += -xF
dtpad_LDFLAGS = -lintl -lresolv
endif

View file

@ -5,7 +5,7 @@ bin_PROGRAMS = dtsession
bin_SCRIPTS = dtsession_res
if HAS_PAM_LIBRARY
DTPAMSVCLIB = @LIBPAMSVC@
DTPAMSVCLIB = $(LIBPAMSVC)
else
DTPAMSVCLIB =
endif

View file

@ -4,7 +4,7 @@ bin_PROGRAMS = dtstyle
dtstyle_CPPFLAGS = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -I../dthelp \
-I$(DT_INCDIR)
$(DT_INCDIR)
dtstyle_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)

View file

@ -6,7 +6,7 @@ dtudcexch_CFLAGS = -I$(FONTEDT_PATH1) -I$(FONTEDT_PATH1)/include \
-I$(FONTEDT_PATH1)/libfal -I$(FONTEDT_PATH1)/dtgpftobdf \
-DFONTC='"'$(BDFTOPCF)'"'
dtudcexch_LDADD = $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS} \
dtudcexch_LDADD = $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIBS} \
$(FONTEDT_PATH1)/libfuty/liboakfuty.a \
$(FONTEDT_PATH1)/libfal/libfal.a
@ -14,10 +14,6 @@ if SOLARIS
dtudcexch_LDADD += -ldl -lgen
endif
if AIX
dtudcexch_LDADD += -ldl -liconv
endif
if FREEBSD
dtudcexch_LDADD += -liconv
endif

View file

@ -12,8 +12,8 @@ AM_CPPFLAGS = -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE -DUNMAP_ON_RESTART \
-DBATCH_DRAG_REQUESTS -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
dtwm_LDADD = $(DTCLIENTLIBS) -lXext $(XTOOLLIB)
dtfplist_LDADD = @DTCLIENTLIBS@ $(TIRPCLIB) -lXm -lXext $(XTOOLLIB)
dtwm_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
dtfplist_LDADD = $(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB)
if SOLARIS
dtwm_LDADD += -lintl -lresolv