[socket_ldflags="-lsocket"]
)
AC_SUBST(socket_ldflags)
+########################################################################## iconv
+STASH_FLAGS
+LIBS=
+AC_SEARCH_LIBS([libiconv_open], [iconv],
+ [iconv_ldflags="$LIBS"],
+ []
+)
+AC_SUBST(iconv_ldflags)
+AC_MSG_CHECKING([whether iconv needs const char ** cast])
+AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([
+ #include <iconv.h>
+ ],[
+ size_t iconv(iconv_t cd, const char **inbuf,
+ size_t *inbytesleft, char **outbuf,
+ size_t *outbytesleft);
+ ])
+],
+ [cast='(const char **)'; msg=yes],
+ [cast=; msg=no]
+)
+AC_DEFINE_UNQUOTED(ICONV_CAST, $cast, [cast for second arg to iconv()])
+AC_MSG_RESULT($msg)
+UNSTASH_FLAGS
########################################################################### libnsl
AC_CHECK_LIB([c], [gethostbyname],
[nsl_ldflags=],
)
AC_SUBST(ggo_descriptions_declared)
########################################################################### curses
-have_curses="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir,
- [look for curses.h also in dir])])
-if test -n "$with_curses_headers"; then
- curses_cppflags="-I$with_curses_headers"
- CPPFLAGS="$CPPFLAGS $curses_cppflags"
-fi
-AC_ARG_WITH(curses_libs, [AS_HELP_STRING(--with-curses-libs=dir,
- [look for libcurses also in dir])])
-if test -n "$with_curses_libs"; then
- curses_libs="-L$with_curses_libs"
- LDFLAGS="$LDFLAGS $curses_libs"
-fi
-AC_CHECK_HEADER(curses.h, [], [
- have_curses="no"
-])
-curses_ldflags="$curses_libs"
-AC_CHECK_LIB([ncursesw], [initscr],
- [curses_ldflags="$curses_libs -lncursesw"], [
- AC_CHECK_LIB([curses], [initscr],
- [curses_ldflags="$curses_libs -lcurses"],
- [have_curses="no"]
- )
- ]
-)
-AC_SUBST(curses_cppflags)
-AC_SUBST(curses_ldflags)
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+STASH_FLAGS
+LIB_ARG_WITH([curses], [])
+HAVE_CURSES=yes
+AC_CHECK_HEADER(curses.h, [], [HAVE_CURSES=no])
+AC_SEARCH_LIBS([initscr], [ncursesw curses], [], [HAVE_CURSES=no])
+curses_ldflags="$curses_ldflags $LIBS"
+LIB_SUBST_FLAGS(curses)
+UNSTASH_FLAGS
########################################################################### ip_mreqn
AC_MSG_CHECKING(for struct ip_mreqn (UDPv4 multicast))
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
HAVE_OGG=yes
AC_CHECK_HEADERS([ogg/ogg.h], [], [HAVE_OGG=no])
AC_CHECK_LIB([ogg], [ogg_stream_init], [], [HAVE_OGG=no])
+AC_CHECK_LIB([ogg], [ogg_stream_flush_fill], [
+ AC_DEFINE(HAVE_OGG_STREAM_FLUSH_FILL, 1, [libogg >= 1.3.0])])
LIB_SUBST_FLAGS(ogg)
UNSTASH_FLAGS
######################################################################### vorbis
LIB_SUBST_FLAGS(ao)
UNSTASH_FLAGS
AC_DEFUN([NEED_AO_OBJECTS], [{ test $HAVE_AO = yes -a $HAVE_PTHREAD = yes; }])
-############################################################# readline
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-have_readline="yes"
-AC_ARG_WITH(readline_headers, [AS_HELP_STRING(--with-readline-headers=dir,
- [look for libreadline header files also in dir])])
-if test -n "$with_readline_headers"; then
- readline_cppflags="-I$with_readline_headers"
- CPPFLAGS="$CPPFLAGS $readline_cppflags"
-fi
-
-AC_ARG_WITH(readline_libs, [AS_HELP_STRING(--with-readline-libs=dir,
- [look for readline library also in dir])])
-if test -n "$with_readline_libs"; then
- readline_libs="-L$with_readline_libs"
- LDFLAGS="$LDFLAGS $readline_libs"
-fi
-msg="no interactive cli support"
-AC_CHECK_HEADERS([readline/readline.h], [
- ], [
- have_readline="no"
- AC_MSG_WARN([readline/readline.h not found, $msg])
-])
-
-if test "$have_readline" = "yes"; then
- readline_ldflags="$readline_libs"
- AC_SEARCH_LIBS([rl_free_keymap], [readline], [
- readline_ldflags="$readline_ldflags -lreadline"
- ], [have_readline="no"])
- if test "$have_readline" = "no"; then # try with -lcurses
- # clear cache
- AC_MSG_NOTICE([trying again with -lcurses])
- unset ac_cv_search_rl_free_keymap 2> /dev/null
- AC_SEARCH_LIBS([rl_free_keymap], [readline], [
- have_readline=yes
- readline_ldflags="$readline_ldflags -lreadline -lcurses"
- ], [], [-lcurses])
- fi
- if test "$have_readline" = "no"; then # try with -ltermcap
- # clear cache
- AC_MSG_NOTICE([trying again with -ltermcap])
- unset ac_cv_search_rl_free_keymap 2> /dev/null
- AC_SEARCH_LIBS([rl_free_keymap], [readline], [
- have_readline=yes
- readline_ldflags="$readline_ldflags -lreadline -ltermcap"
- ], [], [-ltermcap])
- fi
-fi
-
-if test "$have_readline" = "yes"; then
- AC_CHECK_DECL(
- [rl_free_keymap],
- [AC_DEFINE(RL_FREE_KEYMAP_DECLARED, 1, readline >= 6.3)],
- [],
- [
- #include <stdio.h>
- #include <readline/readline.h>
- ]
- )
- AC_SUBST(readline_cppflags)
- AC_SUBST(readline_ldflags)
- AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
-else
- AC_MSG_WARN([libreadline not found or unusable])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+######################################################################## readline
+STASH_FLAGS
+AC_SEARCH_LIBS([tgetent], [tinfo curses terminfo termcap])
+LIB_ARG_WITH([readline], [-lreadline $LIBS])
+HAVE_READLINE=yes
+AC_CHECK_HEADER([readline/readline.h], [], [HAVE_READLINE=no])
+AC_CHECK_LIB([readline], [rl_free_keymap], [], HAVE_READLINE=no)
+AC_CHECK_DECL(
+ [rl_free_keymap],
+ [AC_DEFINE(RL_FREE_KEYMAP_DECLARED, 1, readline >= 6.3)],
+ [],
+ [
+ #include <stdio.h>
+ #include <readline/readline.h>
+ ]
+)
+LIB_SUBST_FLAGS(readline)
+UNSTASH_FLAGS
############################################################# libsamplerate
STASH_FLAGS
LIB_ARG_WITH([samplerate], [-lsamplerate])
else
client_errlist_objs="$client_errlist_objs gcrypt"
fi
- if test "$have_readline" = "yes"; then
+ if test $HAVE_READLINE = yes; then
client_errlist_objs="$client_errlist_objs interactive"
fi
client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
AC_MSG_WARN([no mixer support])
fi
########################################################################### gui
-if test "$have_curses" = "yes"; then
+if test $HAVE_CURSES = yes; then
build_gui="yes"
executables="$executables gui"
gui_cmdline_objs="gui"
play_errlist_objs="$play_errlist_objs ao_write"
play_cmdline_objs="$play_cmdline_objs ao_write"
}
-if test "$have_readline" = "yes"; then
+if test $HAVE_READLINE = yes; then
play_errlist_objs="$play_errlist_objs interactive"
fi
if test $HAVE_SAMPLERATE = yes; then
version
ggo
"
-if test "$have_readline" = "yes"; then
+if test $HAVE_READLINE = yes; then
audioc_errlist_objs="$audioc_errlist_objs
buffer_tree
interactive
~~~~~~~~~~~~~~~~~~~~~~~~
crypto lib: ${CRYPTOLIB:-[none]}
unix socket credentials: $have_ucred
-readline (interactive CLIs): $have_readline
+readline (interactive CLIs): $HAVE_READLINE
audio formats handlers: $audio_format_handlers
id3 version 2 support: $HAVE_ID3TAG
filters: $filters
projects / paraslash.git / blobdiff