From 60e60b9836f8ce6c3ffff25a72d191b2af4dd15d Mon Sep 17 00:00:00 2001
From: Chase <nicetrynsa@protonmail.ch>
Date: Sat, 30 Jul 2022 20:55:31 -0500
Subject: [PATCH] configure: detect libm

---
 cde/configure.ac                                    | 3 +++
 cde/lib/DtHelp/Makefile.am                          | 2 +-
 cde/lib/DtSearch/Makefile.am                        | 2 +-
 cde/programs/dtappbuilder/src/ab/Makefile.am        | 2 +-
 cde/programs/dtappbuilder/src/abmf/Makefile.am      | 2 +-
 cde/programs/dtappbuilder/src/libABobj/Makefile.am  | 4 +---
 cde/programs/dtappbuilder/src/libAButil/Makefile.am | 4 ++--
 cde/programs/dtcm/server/Makefile.am                | 2 +-
 cde/programs/dthelp/dthelpprint/Makefile.am         | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cde/configure.ac b/cde/configure.ac
index 88f662625..5946c27a3 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -506,6 +506,9 @@ AC_CHECK_LIB(Xdmcp, XdmcpFlush, [XDMCPLIB="-lXdmcp"], [XDMCPLIB=""],
                  [${EXTRA_INCS} ${EXTRA_LIBS}])
 AC_SUBST(XDMCPLIB)
 
+AC_SEARCH_LIBS(cos, m, [], [
+	AC_MSG_ERROR([cos not found, your system probably doesn't obey posix])])
+
 AC_SEARCH_LIBS(dlopen, [dl dld], [], [
 	AC_MSG_ERROR([dlopen not found, your system probably doesn't obey posix]
 	)])
diff --git a/cde/lib/DtHelp/Makefile.am b/cde/lib/DtHelp/Makefile.am
index 8aad06f3f..a3b59681b 100644
--- a/cde/lib/DtHelp/Makefile.am
+++ b/cde/lib/DtHelp/Makefile.am
@@ -16,7 +16,7 @@ libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \
 libDtHelp_la_LIBADD = $(JPEGLIB) il/libil.la $(LTLIBICONV)
 
 if SOLARIS
-libDtHelp_la_LIBADD += -lw -lgen -lm -lc
+libDtHelp_la_LIBADD += -lw -lgen -lc
 endif
 
 
diff --git a/cde/lib/DtSearch/Makefile.am b/cde/lib/DtSearch/Makefile.am
index fce13b0b6..5c359728f 100644
--- a/cde/lib/DtSearch/Makefile.am
+++ b/cde/lib/DtSearch/Makefile.am
@@ -22,7 +22,7 @@ endif
 libDtSearch_la_LIBADD = raima/libraima.la
 
 if SOLARIS
-libDtSearch_la_LIBADD += -lm -lc
+libDtSearch_la_LIBADD += -lc
 endif
 
 libDtSearch_la_SOURCES = apndext.c	ausdopen.c	ausexit.c \
diff --git a/cde/programs/dtappbuilder/src/ab/Makefile.am b/cde/programs/dtappbuilder/src/ab/Makefile.am
index e40629c7e..c0dee1a6f 100644
--- a/cde/programs/dtappbuilder/src/ab/Makefile.am
+++ b/cde/programs/dtappbuilder/src/ab/Makefile.am
@@ -47,7 +47,7 @@ dtbuilder_LDADD = ../libABil/libABil.a  ../libABobjXm/libABobjXm.a  \
         ../libABobj/libABobj.a ../libAButil/libAButil.a \
         $(LIBWIDGET) $(LIBTERM) $(LIBHELP) $(LIBSVC) \
         $(LIBTT) $(LIBXIN) -lUil $(MRESOURCELIB) $(XTOOLLIB) ${X_LIB} \
-        $(UTILLIB) -lm
+	$(UTILLIB)
 
 dtbuilder_CFLAGS = -DPIXMAP_WORKAROUND $(ABINCLUDES)
 
diff --git a/cde/programs/dtappbuilder/src/abmf/Makefile.am b/cde/programs/dtappbuilder/src/abmf/Makefile.am
index 4578520f1..ee697131a 100644
--- a/cde/programs/dtappbuilder/src/abmf/Makefile.am
+++ b/cde/programs/dtappbuilder/src/abmf/Makefile.am
@@ -44,7 +44,7 @@ dtcodegen_SOURCES = abmf.c                  args.c \
 		    utils_header_file.c     write_c.c \
 		    write_code.c
 
-#ab_func_strings_LDADD = -lm ../libAButil/libAButil.a
+#ab_func_strings_LDADD = ../libAButil/libAButil.a
 
 #ab_func_strings_SOURCES = ab_func_strings.c
 
diff --git a/cde/programs/dtappbuilder/src/libABobj/Makefile.am b/cde/programs/dtappbuilder/src/libABobj/Makefile.am
index f74e52884..af17282a9 100644
--- a/cde/programs/dtappbuilder/src/libABobj/Makefile.am
+++ b/cde/programs/dtappbuilder/src/libABobj/Makefile.am
@@ -4,10 +4,8 @@ ABINCLUDES = ../include
 
 EXTRA_DEFINES =  -D_POSIX_SOURCE=1
 
-EXTRALIBS = -lm
-
 if SOLARIS
-EXTRALIBS += -lgen
+EXTRALIBS = -lgen
 endif
 
 noinst_LIBRARIES = libABobj.a
diff --git a/cde/programs/dtappbuilder/src/libAButil/Makefile.am b/cde/programs/dtappbuilder/src/libAButil/Makefile.am
index d683a00e8..af3aa55ac 100644
--- a/cde/programs/dtappbuilder/src/libAButil/Makefile.am
+++ b/cde/programs/dtappbuilder/src/libAButil/Makefile.am
@@ -21,13 +21,13 @@ libAButil_a_SOURCES = abio.c          \
 		      util_file.c     \
 		      util_string.c
 
-#util_test_LDADD = libAButil.a -lm
+#util_test_LDADD = libAButil.a
 
 #util_test_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)
 
 #util_test_SOURCES = util_test.c
 
-#istr_test_LDADD = libAButil.a -lm
+#istr_test_LDADD = libAButil.a
 
 #istr_test_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)
 
diff --git a/cde/programs/dtcm/server/Makefile.am b/cde/programs/dtcm/server/Makefile.am
index bd49c472c..a4ac7dc55 100644
--- 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
+rpc_cmsd_LDADD += -lsocket -lnsl -lintl
 endif
 
 rpc_cmsd_SOURCES = parser.c access.c callback.c cmscalendar.c		\
diff --git a/cde/programs/dthelp/dthelpprint/Makefile.am b/cde/programs/dthelp/dthelpprint/Makefile.am
index c493da6e7..81eda923f 100644
--- 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 -lgen -lm
+dthelpprint_LDADD += -lw -lgen
 endif
 
 dthelpprint_SOURCES = Main.c Initialize.c PrintUtil.c PrintTopics.c \