mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-13 03:32:24 +00:00
configure: detect libdl
This commit is contained in:
parent
4370a95a84
commit
9a9d586e87
34 changed files with 33 additions and 104 deletions
|
@ -506,6 +506,10 @@ AC_CHECK_LIB(Xdmcp, XdmcpFlush, [XDMCPLIB="-lXdmcp"], [XDMCPLIB=""],
|
|||
[${EXTRA_INCS} ${EXTRA_LIBS}])
|
||||
AC_SUBST(XDMCPLIB)
|
||||
|
||||
AC_SEARCH_LIBS(dlopen, [dl dld], [], [
|
||||
AC_MSG_ERROR([dlopen not found, your system probably doesn't obey posix]
|
||||
)])
|
||||
|
||||
dnl iconv
|
||||
AM_ICONV
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ libDtTerm_la_LIBADD += -lutil
|
|||
endif
|
||||
|
||||
if SOLARIS
|
||||
libDtTerm_la_LIBADD += -ldl -lgen
|
||||
libDtTerm_la_LIBADD += -lgen
|
||||
endif
|
||||
|
||||
if HAS_UTEMPTER_LIBRARY
|
||||
|
|
|
@ -10,7 +10,7 @@ AM_CXXFLAGS = -I../../lib $(TT_VERSION_DEFINE)
|
|||
LDADD = $(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
LDADD += -ldl -lintl -lsocket -lnsl
|
||||
LDADD += -lintl -lsocket -lnsl
|
||||
endif
|
||||
|
||||
ttmv_SOURCES = ttmv.C mover.C
|
||||
|
|
|
@ -21,7 +21,7 @@ tt_type_comp_SOURCES = mp_type_comp.C mp_types_table.C \
|
|||
tt_type_comp_LDADD = ../../slib/libstt.a $(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
tt_type_comp_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
|
||||
tt_type_comp_LDADD += $(XTOOLLIB) -lintl -lsocket -lnsl
|
||||
endif
|
||||
|
||||
frozen.mp_types_lex.o: frozen.mp_types_gram.h
|
||||
|
|
|
@ -11,7 +11,7 @@ ttauth_LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
|||
endif
|
||||
|
||||
if SOLARIS
|
||||
ttauth_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
|
||||
ttauth_LDADD += $(XTOOLLIB) -lintl -lsocket -lnsl
|
||||
endif
|
||||
|
||||
if BSD
|
||||
|
|
|
@ -16,7 +16,7 @@ rpc_ttdbserver_LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
|||
endif
|
||||
|
||||
if SOLARIS
|
||||
rpc_ttdbserver_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
|
||||
rpc_ttdbserver_LDADD += $(XTOOLLIB) -lintl -lsocket -lnsl
|
||||
endif
|
||||
|
||||
if BSD
|
||||
|
|
|
@ -14,7 +14,7 @@ ttsession_LDADD += $(TIRPCLIB) $(XTOOLLIB)
|
|||
endif
|
||||
|
||||
if SOLARIS
|
||||
ttsession_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
|
||||
ttsession_LDADD += $(XTOOLLIB) -lintl -lsocket -lnsl
|
||||
endif
|
||||
|
||||
if BSD
|
||||
|
|
|
@ -11,7 +11,7 @@ tttar_LDADD = ../../slib/libstt.a ../../mini_isam/libisam.a \
|
|||
$(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
tttar_LDADD += -ldl -lintl -lsocket -lnsl
|
||||
tttar_LDADD += -lintl -lsocket -lnsl
|
||||
endif
|
||||
|
||||
tttar_SOURCES = tttar.C \
|
||||
|
|
|
@ -7,7 +7,7 @@ tttrace_CXXFLAGS = -I../../lib
|
|||
tttrace_LDADD = $(LIBTT) $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
tttrace_LDADD += -ldl -lintl -lsocket -lnsl
|
||||
tttrace_LDADD += -lintl -lsocket -lnsl
|
||||
endif
|
||||
|
||||
tttrace_SOURCES = tttrace.C tttrace_objs.C
|
||||
|
|
|
@ -1,47 +0,0 @@
|
|||
# %% (c) Copyright 1993, 1994 Hewlett-Packard Company
|
||||
# %% (c) Copyright 1993, 1994 International Business Machines Corp.
|
||||
# %% (c) Copyright 1993, 1994 Sun Microsystems, Inc.
|
||||
# %% (c) Copyright 1993, 1994 Novell, Inc.
|
||||
# %% $XConsortium: IMakeFile /main/3 1995/10/20 17:04:55 rswiston $
|
||||
#ifdef HideFromImake
|
||||
#
|
||||
# IMakeFile 1.7 17 Nov 1994
|
||||
#
|
||||
# This preamble turns this imakefile into a shell script which will
|
||||
# create/update this directory's makefile when invoked as follows:
|
||||
# % sh IMakeFile [[GNU]MakeFile]
|
||||
#
|
||||
IMAKEDIR=../../../imake; export IMAKEDIR
|
||||
exec make -f $IMAKEDIR/Boot.mk ${1+"$@"}
|
||||
#endif HideFromImake
|
||||
|
||||
TT_DIR = ../../..
|
||||
|
||||
include $(TT_DIR)/Make.macros
|
||||
|
||||
.KEEP_STATE:
|
||||
|
||||
default: all
|
||||
|
||||
All:: $(MAKEFILE)s all
|
||||
all: DynamicDebugProg(CoEd)
|
||||
|
||||
CoEd_SOURCES.C = CoEdTextBuffer.C CoEditor.C CoEd.C
|
||||
|
||||
RUN_PATH = -R /tt/proto/lib:/usr/dt/lib:$(OPENWINHOME)/lib:/opt/SUNWspro/lib
|
||||
|
||||
ProgramDynamicOptimized(CoEd)
|
||||
ProgramDynamicDebug(CoEd)
|
||||
SourceHygiene(CoEd)
|
||||
|
||||
SaberProg(CoEd)
|
||||
|
||||
AppendVal(CPPFLAGS,-I../../../proto/include -I/usr/dt/include -I$(OPENWINHOME)/include -I../libCoEd)
|
||||
|
||||
AppendVal(LDFLAGS,-L../../../proto/lib -L/usr/dt/lib -L$(OPENWINHOME)/lib -L../libCoEd/$(OEUVRE)/pdc/O)
|
||||
|
||||
#AppendVal(LDLIBS,-ltt-g -lXm -lXt -lX11 -Bstatic -lCoEd -Bdynamic)
|
||||
AppendVal(LDLIBS,-ltt -lXm -lXt -lX11 -Bstatic -lCoEd -Bdynamic)
|
||||
loc_LDLIBS_SunOS4 = -lce -lX -lI18N -ldl
|
||||
loc_LDLIBS_SunOS5 = -lnsl -lsocket -lintl -lgen
|
||||
AppendVal(LDLIBS,$(loc_LDLIBS_$(OS)))
|
|
@ -18,7 +18,7 @@ libtt_la_LIBADD = api/c/libapi.la api/dnd/libdnd.la db/libdb.la mp/libmp.la \
|
|||
|
||||
if SOLARIS
|
||||
# This stuff should be figured out by configure
|
||||
libtt_la_LIBADD += -lnsl -lsocket -lintl -ldl -lc -lw
|
||||
libtt_la_LIBADD += -lnsl -lsocket -lintl -lc -lw
|
||||
endif
|
||||
|
||||
if LINUX
|
||||
|
|
|
@ -2,8 +2,4 @@ bin_PROGRAMS = dsdm
|
|||
|
||||
dsdm_LDADD = $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dsdm_LDADD += -ldl
|
||||
endif
|
||||
|
||||
dsdm_SOURCES = dsdm.c proxy.c
|
||||
|
|
|
@ -6,10 +6,6 @@ dtaction_SOURCES = Main.c
|
|||
|
||||
dtaction_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dtaction_LDADD += -ldl
|
||||
endif
|
||||
|
||||
if LINUX
|
||||
dtaction_LDADD += -lcrypt
|
||||
endif
|
||||
|
|
|
@ -7,7 +7,7 @@ EXTRA_DEFINES = -D_POSIX_SOURCE=1
|
|||
EXTRALIBS = -lm
|
||||
|
||||
if SOLARIS
|
||||
EXTRALIBS += -ldl -lgen
|
||||
EXTRALIBS += -lgen
|
||||
endif
|
||||
|
||||
noinst_LIBRARIES = libABobj.a
|
||||
|
|
|
@ -7,7 +7,7 @@ dtcalc_CPPFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
|
|||
dtcalc_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dtcalc_LDADD += -lintl -ldl
|
||||
dtcalc_LDADD += -lintl
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ rpc_cmsd_CFLAGS = -I../../../lib/csa $(DT_INCDIR) $(CSA_INCDIR)
|
|||
rpc_cmsd_LDADD = $(LIBCSA) $(DTCLIENTLIBS) $(TIRPCLIB) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
rpc_cmsd_LDADD += -lsocket -lnsl -lintl -lm -ldl
|
||||
rpc_cmsd_LDADD += -lsocket -lnsl -lintl -lm
|
||||
endif
|
||||
|
||||
rpc_cmsd_SOURCES = parser.c access.c callback.c cmscalendar.c \
|
||||
|
|
|
@ -4,10 +4,6 @@ bin_PROGRAMS = dtcreate
|
|||
|
||||
dtcreate_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dtcreate_LDADD += -ldl
|
||||
endif
|
||||
|
||||
dtcreate_SOURCES = main.c AddFiletype.c Confirmed.c \
|
||||
CreateActionAppShell.c FileCharacteristics.c OpenFile.c \
|
||||
UxXt.c ca_aux.c cmncbs.c cmnutils.c cmnrtns.c ErrorDialog.c \
|
||||
|
|
|
@ -5,7 +5,7 @@ bin_PROGRAMS = dtdbcache
|
|||
dtdbcache_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dtdbcache_LDADD += -ldl -lw -lgen
|
||||
dtdbcache_LDADD += -lw -lgen
|
||||
endif
|
||||
|
||||
dtdbcache_SOURCES = Main.c
|
||||
|
|
|
@ -15,6 +15,6 @@ dtdspmsg_LDADD =
|
|||
dtdspmsg_CFLAGS = -DNO_XLIB
|
||||
|
||||
if SOLARIS
|
||||
dtdspmsg_LDADD += -ldl -lgen
|
||||
dtdspmsg_LDADD += -lgen
|
||||
endif
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ bin_PROGRAMS = dthello
|
|||
dthello_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dthello_LDADD += -ldl -lgen
|
||||
dthello_LDADD += -lgen
|
||||
endif
|
||||
|
||||
if LINUX
|
||||
|
|
|
@ -10,7 +10,7 @@ dthelpprint_CPPFLAGS = -I.. -I ../../../lib/DtHelp \
|
|||
dthelpprint_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dthelpprint_LDADD += -lw -ldl -lgen -lm
|
||||
dthelpprint_LDADD += -lw -lgen -lm
|
||||
endif
|
||||
|
||||
dthelpprint_SOURCES = Main.c Initialize.c PrintUtil.c PrintTopics.c \
|
||||
|
|
|
@ -6,10 +6,6 @@ dticon_CFLAGS = -D__TOOLTALK
|
|||
|
||||
dticon_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dticon_LDADD += -ldl
|
||||
endif
|
||||
|
||||
dticon_SOURCES = dtIconShell.c event.c event.h fileIO.c fileIO.h \
|
||||
fileIODialog.c globals.c graphics.c graphics.h \
|
||||
help.c image.c image.h main.c newIconDialog.c \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
CLEANFILES = init.c FEATURE DtFuncs.dtsh
|
||||
CLEANFILES = init.c DtFuncs.dtsh
|
||||
|
||||
SUBDIRS = examples
|
||||
|
||||
|
@ -31,10 +31,6 @@ dtksh_LDADD = $(DTCLIENTLIBS) ksh93/src/cmd/ksh93/pmain.o $(XTOOLLIB) \
|
|||
libshell.a $(KSH93SRC)/lib/libcmd.a $(KSH93SRC)/lib/libast.a \
|
||||
$(KSH93SRC)/lib/libdll.a
|
||||
|
||||
if LINUX
|
||||
dtksh_LDADD += -ldl
|
||||
endif
|
||||
|
||||
if SOLARIS
|
||||
dtksh_LDADD += -lsecdb -lsocket -lnsl
|
||||
endif
|
||||
|
|
|
@ -88,9 +88,9 @@ endif
|
|||
|
||||
if SOLARIS
|
||||
XBINDIR = /usr/bin/X11
|
||||
dtlogin_LDADD += -ldl -lgen -lresolv -lbsm -lcmd
|
||||
dtgreet_LDADD += -ldl -lgen -lresolv -lbsm -lcmd
|
||||
dtchooser_LDADD += -ldl -lgen -lresolv -lbsm -lcmd
|
||||
dtlogin_LDADD += -lgen -lresolv -lbsm -lcmd
|
||||
dtgreet_LDADD += -lgen -lresolv -lbsm -lcmd
|
||||
dtchooser_LDADD += -lgen -lresolv -lbsm -lcmd
|
||||
dtlogin_SOURCES += solaris.c
|
||||
endif
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ dtpdm_CFLAGS = -DI18N_MSG -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
|
|||
dtpdm_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dtpdm_LDADD += -lintl -lgen -ldl -lresolv
|
||||
dtpdm_LDADD += -lintl -lgen -lresolv
|
||||
endif
|
||||
|
||||
dtpdm_SOURCES = JobBox.c Main.c MainWindow.c PdmMsgs.c PdmOid.c \
|
||||
|
|
|
@ -6,9 +6,5 @@ dtpdmd_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
|
|||
|
||||
dtpdmd_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dtpdmd_LDADD += -ldl
|
||||
endif
|
||||
|
||||
dtpdmd_SOURCES = dispatch.c dtpdmd.c mailbox.c manager.c records.c \
|
||||
nlmsg.c setup.c util.c dtpdmdP.h nlmsg.h
|
||||
|
|
|
@ -51,10 +51,6 @@ UI_SRC = UI/DtActions.C UI/DtFindD.h UI/DtProps.C UI/DtSetModList.h \
|
|||
dtprintinfo_SOURCES = $(UTIL_SRC) $(LIBUI_SRC) $(OBJ_SRC) $(UI_SRC) \
|
||||
DtPrintinfo.C dtprintinfomsg.h
|
||||
|
||||
if SOLARIS
|
||||
dtprintinfo_LDADD += -ldl
|
||||
endif
|
||||
|
||||
# special processing for message files
|
||||
SYM2NUM_CMD = CPP=$(GENCPP) $(KSH) sym2num
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ bin_PROGRAMS = dtscreen
|
|||
dtscreen_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dtscreen_LDADD += -ldl -lgen
|
||||
dtscreen_LDADD += -lgen
|
||||
endif
|
||||
|
||||
dtscreen_SOURCES = blank.c dtscreen.c flame.c hopalong.c hsbramp.c \
|
||||
|
|
|
@ -7,7 +7,7 @@ dtappgather_CXXFLAGS = -I../libCliSrv $(DT_INCDIR)
|
|||
dtappgather_LDADD = ../libCliSrv/libCliSrv.a $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dtappgather_LDADD += -ldl -lintl
|
||||
dtappgather_LDADD += -lintl
|
||||
endif
|
||||
|
||||
dtappgather_SOURCES = Options.C dtappgather.C dtappgather.h Options.h
|
||||
|
|
|
@ -6,7 +6,7 @@ libCliSrv_a_CXXFLAGS = $(DT_INCDIR)
|
|||
|
||||
if SOLARIS
|
||||
libCliSrv_a_CXXFLAGS += -DIOSTREAMSWORKS
|
||||
libCliSrv_a_LIBADD = -ldl -lintl -lc -ladm
|
||||
libCliSrv_a_LIBADD = -lintl -lc -ladm
|
||||
endif
|
||||
|
||||
libCliSrv_a_SOURCES = DirIterator.C Environ.C TTFile.C UnixEnv.C \
|
||||
|
|
|
@ -30,12 +30,12 @@ dtsession_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) $(DTPAMSVCLIB)
|
|||
|
||||
if SOLARIS
|
||||
dtsession_SOURCES += OWsync.c
|
||||
dtsession_LDADD += -lelf -ldl
|
||||
dtsession_LDADD += -lelf
|
||||
endif
|
||||
|
||||
if LINUX
|
||||
dtsession_CFLAGS += -DUSE_X11SSEXT
|
||||
dtsession_LDADD += $(TIRPCLIB) -lXss -ldl
|
||||
dtsession_LDADD += $(TIRPCLIB) -lXss
|
||||
endif
|
||||
|
||||
if BSD
|
||||
|
|
|
@ -9,7 +9,7 @@ dtspcd_CFLAGS = -DCDE_CONFIGURATION_TOP=\"${prefix}\" \
|
|||
dtspcd_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dtspcd_LDADD += -ldl -lgen
|
||||
dtspcd_LDADD += -lgen
|
||||
endif
|
||||
|
||||
cfgdir = $(CDE_INSTALLATION_TOP)/config
|
||||
|
|
|
@ -11,7 +11,7 @@ dtudcexch_LDADD = $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIBS} \
|
|||
$(FONTEDT_PATH1)/libfal/libfal.a
|
||||
|
||||
if SOLARIS
|
||||
dtudcexch_LDADD += -ldl -lgen
|
||||
dtudcexch_LDADD += -lgen
|
||||
endif
|
||||
|
||||
if FREEBSD
|
||||
|
|
|
@ -5,6 +5,6 @@ bin_PROGRAMS = dttypes
|
|||
dttypes_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
if SOLARIS
|
||||
dttypes_LDADD += -ldl -lgen
|
||||
dttypes_LDADD += -lgen
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue