configure: detect libdl

2022-07-30 20:33:24 -05:00
parent 4370a95a84
commit 9a9d586e87
34 changed files with 33 additions and 104 deletions
--- a/cde/programs/dsdm/Makefile.am
+++ b/cde/programs/dsdm/Makefile.am
@@ -2,8 +2,4 @@ bin_PROGRAMS = dsdm

 dsdm_LDADD = $(XTOOLLIB)

-if SOLARIS
-dsdm_LDADD += -ldl
-endif
-
 dsdm_SOURCES = dsdm.c proxy.c
--- a/cde/programs/dtaction/Makefile.am
+++ b/cde/programs/dtaction/Makefile.am
@@ -6,10 +6,6 @@ dtaction_SOURCES = Main.c

 dtaction_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)

-if SOLARIS
-dtaction_LDADD += -ldl
-endif
-
 if LINUX
 dtaction_LDADD += -lcrypt
 endif
--- a/cde/programs/dtappbuilder/src/libABobj/Makefile.am
+++ b/cde/programs/dtappbuilder/src/libABobj/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DEFINES =  -D_POSIX_SOURCE=1
 EXTRALIBS = -lm

 if SOLARIS
-EXTRALIBS += -ldl -lgen
+EXTRALIBS += -lgen
 endif

 noinst_LIBRARIES = libABobj.a
--- a/cde/programs/dtcalc/Makefile.am
+++ b/cde/programs/dtcalc/Makefile.am
@@ -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


--- a/cde/programs/dtcm/server/Makefile.am
+++ b/cde/programs/dtcm/server/Makefile.am
@@ -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		\
--- a/cde/programs/dtcreate/Makefile.am
+++ b/cde/programs/dtcreate/Makefile.am
@@ -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	\
--- a/cde/programs/dtdbcache/Makefile.am
+++ b/cde/programs/dtdbcache/Makefile.am
@@ -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
--- a/cde/programs/dtdspmsg/Makefile.am
+++ b/cde/programs/dtdspmsg/Makefile.am
@@ -15,6 +15,6 @@ dtdspmsg_LDADD =
 dtdspmsg_CFLAGS = -DNO_XLIB

 if SOLARIS
-dtdspmsg_LDADD += -ldl -lgen
+dtdspmsg_LDADD += -lgen
 endif

--- a/cde/programs/dthello/Makefile.am
+++ b/cde/programs/dthello/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = dthello
 dthello_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)

 if SOLARIS
-dthello_LDADD += -ldl -lgen
+dthello_LDADD += -lgen
 endif

 if LINUX
--- a/cde/programs/dthelp/dthelpprint/Makefile.am
+++ b/cde/programs/dthelp/dthelpprint/Makefile.am
@@ -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 \
--- a/cde/programs/dticon/Makefile.am
+++ b/cde/programs/dticon/Makefile.am
@@ -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		\
--- a/cde/programs/dtksh/Makefile.am
+++ b/cde/programs/dtksh/Makefile.am
@@ -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
--- a/cde/programs/dtlogin/Makefile.am
+++ b/cde/programs/dtlogin/Makefile.am
@@ -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

--- a/cde/programs/dtpdm/Makefile.am
+++ b/cde/programs/dtpdm/Makefile.am
@@ -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		\
--- a/cde/programs/dtpdmd/Makefile.am
+++ b/cde/programs/dtpdmd/Makefile.am
@@ -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
--- a/cde/programs/dtprintinfo/Makefile.am
+++ b/cde/programs/dtprintinfo/Makefile.am
@@ -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

--- a/cde/programs/dtscreen/Makefile.am
+++ b/cde/programs/dtscreen/Makefile.am
@@ -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	\
--- a/cde/programs/dtsearchpath/dtappg/Makefile.am
+++ b/cde/programs/dtsearchpath/dtappg/Makefile.am
@@ -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
--- a/cde/programs/dtsearchpath/libCliSrv/Makefile.am
+++ b/cde/programs/dtsearchpath/libCliSrv/Makefile.am
@@ -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	\
--- a/cde/programs/dtsession/Makefile.am
+++ b/cde/programs/dtsession/Makefile.am
@@ -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
--- a/cde/programs/dtspcd/Makefile.am
+++ b/cde/programs/dtspcd/Makefile.am
@@ -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
--- a/cde/programs/dtudcexch/Makefile.am
+++ b/cde/programs/dtudcexch/Makefile.am
@@ -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
--- a/cde/programs/util/dttypes/Makefile.am
+++ b/cde/programs/util/dttypes/Makefile.am
@@ -5,6 +5,6 @@ bin_PROGRAMS = dttypes
 dttypes_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)

 if SOLARIS
-dttypes_LDADD += -ldl -lgen
+dttypes_LDADD += -lgen
 endif