# Required header files
AC_CHECK_HEADERS([ \
- fcntl.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h string.h \
+ fcntl.h netdb.h netinet/in.h stdlib.h string.h \
strings.h sys/socket.h sys/time.h unistd.h \
],,AC_MSG_ERROR([required C header missing!]))
# Optional header files
AC_CHECK_HEADERS_ONCE([ \
- arpa/inet.h inttypes.h malloc.h netinet/ip.h stdbool.h stddef.h \
- stdint.h varargs.h \
+ arpa/inet.h inttypes.h malloc.h netinet/in_systm.h netinet/ip.h \
+ stdbool.h stddef.h stdint.h varargs.h \
])
# -- Datatypes --
# CHARCONV is the only function depending on it.
x_iconv_on=no
AC_ARG_WITH(iconv,
- [ --with-iconv enable character conversation using libiconv],
+ AS_HELP_STRING([--with-iconv],
+ [enable character conversion using libiconv]),
[ if test "$withval" != "no"; then
if test "$withval" != "yes"; then
CFLAGS="-I$withval/include $CFLAGS"
LDFLAGS="-L$withval/lib $LDFLAGS"
fi
AC_CHECK_LIB(iconv, iconv_open)
- AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes,
+ AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes)
+ if test "$x_iconv_on" != "yes"; then
+ AC_CHECK_LIB(iconv, libiconv_open)
+ AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes)
+ fi
+ if test "$x_iconv_on" != "yes"; then
AC_MSG_ERROR([Can't enable libiconv support!])
- )
- fi
- ]
+ fi
+ fi ]
)
if test "$x_iconv_on" = "yes"; then
AC_DEFINE(ICONV, 1)
echo
-if ! grep "^AUTOMAKE_OPTIONS = ../portab/ansi2knr" src/ngircd/Makefile.am >/dev/null 2>&1; then
+define(_automake_regex_,[[^AUTOMAKE_OPTIONS = [a-z .\-]*/portab/ansi2knr]])
+if ! grep "_automake_regex_" src/ngircd/Makefile.am >/dev/null 2>&1; then
echo "WARNING:"
echo "This GNU automake generated build system does not support \"de-ANSI-fication\","
echo "therefore don't use it to generate \"official\" distribution archives!"