summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGravatar Karl Ramm <kcr@1ts.org>2011-10-30 01:30:27 -0400
committerGravatar Karl Ramm <kcr@1ts.org>2011-10-30 01:30:27 -0400
commitac2c349dd1c84c01bd91c6423259a00a9e531dc4 (patch)
tree44c9fc77685551629a21500a534ea5a00af3c4f5 /configure.ac
parentfb5cefbeaaa15c6aee963d02f29b860bf2c20be5 (diff)
Let's try a simpler autoconf idiom in the hopes of making lenny happy
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
1 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 9d98ef7..8a332a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,12 +93,17 @@ AC_SEARCH_LIBS(socket, socket)
AC_CHECK_LIB(44bsd, strerror)
-AC_ARG_WITH(iconv,
+AC_ARG_WITH(libiconv,
[ --with-libiconv=PREFIX Location for libiconv],
- [CPPFLAGS="$CPPFLAGS -I$libiconv/include"; LDFLAGS="$LDFLAGS -L$libconv/lib"
- AC_CHECK_LIB(iconv, iconv_open, [LIBICONV=-liconv; AC_SUBST(LIBICONV)])],
+ [libiconv="$withval"], [libiconv=no])
+if test "$libiconv" != no; then
+ CPPFLAGS="$CPPFLAGS -I$libiconv/include"
+ LDFLAGS="$LDFLAGS -L$libconv/lib"
+ AC_CHECK_LIB(iconv, iconv_open, [LIBICONV=-liconv; AC_SUBST(LIBICONV)])
+else
AC_CHECK_FUNC(iconv_open, :,
- AC_CHECK_LIB(iconv, iconv_open, [LIBICONV=-liconv; AC_SUBST(LIBICONV)])))
+ AC_CHECK_LIB(iconv, iconv_open, [LIBICONV=-liconv; AC_SUBST(LIBICONV)]))
+fi
AC_SUBST(LIBICONV)
AC_CHECK_LIB(curses, tgetstr, [TLIB=-lcurses], [TLIB=-ltermcap])