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:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user