Change to detect iconv implementation with autoconf

Use iconv.m4 (and required macros) form gettext-0.21.

cde/lib/DtHelp/Makefile.am

@@ -13,10 +13,10 @@ libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \
 		      -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
 		      @DT_INCDIR@ @DTI_INCDIR@
 
-libDtHelp_la_LIBADD = $(JPEGLIB) il/libil.la
+libDtHelp_la_LIBADD = $(JPEGLIB) il/libil.la $(LTLIBICONV)
 
 if SOLARIS
-libDtHelp_la_CFLAGS += -DICONV_INBUF_CONST=const -DLSB_BIT_ORDER
+libDtHelp_la_CFLAGS += -DLSB_BIT_ORDER
 libDtHelp_la_LIBADD += -lw -lgen -lm -lc
 endif
 
@@ -26,7 +26,6 @@ endif
 
 if BSD
 libDtHelp_la_CFLAGS += -DLSB_BIT_ORDER
-libDtHelp_la_LIBADD += -liconv
 endif
 
 

cde/lib/DtHelp/StringFuncs.c

@@ -42,6 +42,9 @@
  **
  ****************************************************************************
  ************************************<+>*************************************/
+#ifdef HAVE_CONFIG_H
+#include <autotools_config.h>
+#endif
 /*
  * system includes
  */
@@ -70,11 +73,7 @@
 # define iconv_close(a)		(0)
 #endif
 
-#ifdef ICONV_INBUF_CONST
-# define ICONV_INBUF_TYPE	const char **
-#else
-# define ICONV_INBUF_TYPE	char **
-#endif
+#define ICONV_INBUF_TYPE	ICONV_CONST char **
 
 /**** Types ****/
 /* Private structure of the IconvContext.  Public