-dnl == Make statically linked test program for dmalloc tests
-if test "$with_dmalloc" = "yes"; then
- EXTRA_PROGS=gomtest_static
+dnl ==========================================================
+dnl My local stuff
+
+gedcom_SYS_NEWLINE
+AM_ICONV
+gedcom_SANE_ICONV
+if test "$am_cv_func_iconv" != yes -o "$is_iconv_sane" != yes; then
+ AC_MSG_ERROR([
+*******************************************************************************
+You need 'iconv' (with features comparable to what is in glibc 2.2) to use this
+library, consider installing GNU libiconv or use --with-libiconv-prefix to
+point to an existing installation of that library (see README)
+*******************************************************************************
+ ])
+fi
+
+if test "${with_libiconv_prefix+set}" = set; then
+ withval="$with_libiconv_prefix"
+
+ for dir in `echo "$withval" | tr : ' '`; do
+ if test -d $dir/lib; then ICONV_LIBPATH="$ICONV_LIBPATH -L$dir/lib"; fi
+ done
+
+ ICONV_PATH=`echo "$withval" | tr : '/bin:'`
+ ICONV_PATH="$ICONV_PATH/bin"