Merge branch 't/configure_improvements'

diff --git a/Makefile.in b/Makefile.in
index 7e21745a433fb3d0d88d069e13c0e16fc7df0f32..8963adad3b7339a1ff6b750f69b597acde1c49f6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,6 @@ CPPFLAGS += -Wbad-function-cast
 CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
 CPPFLAGS += @SSL_CPPFLAGS@
-CPPFLAGS += @ncurses_cppflags@
 CPPFLAGS += @arch_cppflags@
 CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
@@ -196,6 +195,10 @@ $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
        @[ -z "$(Q)" ] || echo 'CC $<'
        $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
+$(object_dir)/gui%.o: gui%.c | $(object_dir)
+       @[ -z "$(Q)" ] || echo 'CC $<'
+       $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $<
+
 $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
        @[ -z "$(Q)" ] || echo 'CC $<'
        $(Q) $(CC) -c $(CPPFLAGS) -Wno-unused-function -o $@ $<
@@ -212,6 +215,7 @@ $(object_dir)/%.d: %.c | $(object_dir)
        @[ -z "$(Q)" ] || echo 'DEP $<'
        $(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@
 
+
 recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
 filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
 client_objs := $(addprefix $(object_dir)/, @client_objs@)
@@ -247,7 +251,7 @@ para_client: $(client_objs)
 
 para_gui: $(gui_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
-       $(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lncurses
+       $(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lcurses
 
 para_audiod: audiod_command_list.c audiod_command_list.h $(audiod_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'

diff --git a/configure.ac b/configure.ac
index e8b2118cdede3d2a1ebabbe751cbaf2b2b741cec..e5a23438dbdcb989abe8d1f4556bc4f1bd689fa5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -353,31 +353,31 @@ if test ${have_ucred} = yes; then
 fi
 
 ########################################################################### curses
-have_ncurses="yes"
+have_curses="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-AC_ARG_WITH(ncurses_headers, [AC_HELP_STRING(--with-ncurses-headers=dir,
-       [look for ncurses.h also in dir])])
-if test -n "$with_ncurses_headers"; then
-       ncurses_cppflags="-I$with_ncurses_headers"
-       CPPFLAGS="$CPPFLAGS $ncurses_cppflags"
+AC_ARG_WITH(curses_headers, [AC_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(ncurses_libs, [AC_HELP_STRING(--with-ncurses-libs=dir,
-       [look for libncurses also in dir])])
-if test -n "$with_ncurses_libs"; then
-       ncurses_libs="-L$with_ncurses_libs"
-       LDFLAGS="$LDFLAGS $ncurses_libs"
+AC_ARG_WITH(curses_libs, [AC_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_ncurses="no"
+       have_curses="no"
 ])
-AC_CHECK_LIB([ncurses], [initscr], [], [
-       have_ncurses="no"
+AC_CHECK_LIB([curses], [initscr], [], [
+       have_curses="no"
 ])
-if test "$have_ncurses" = "yes"; then
-       AC_SUBST(ncurses_cppflags)
-       AC_DEFINE(HAVE_NCURSES, 1, [define to 1 to turn on ncurses support])
+if test "$have_curses" = "yes"; then
+       AC_SUBST(curses_cppflags)
+       AC_DEFINE(HAVE_NCURSES, 1, [define to 1 to turn on curses support])
        extras="$extras gui"
        executables="$executables gui"
 else
@@ -430,86 +430,120 @@ if test ${have_core_audio} = yes; then
 fi
 ########################################################### ogg/vorbis/speex
 have_ogg="yes"
-have_vorbis="yes"
-have_speex="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-AC_ARG_WITH(oggvorbis_headers, [AC_HELP_STRING(--with-oggvorbis-headers=dir,
-       [look for ogg/vorbis/speex headers also in dir])])
-if test -n "$with_oggvorbis_headers"; then
-       ogg_cppflags="-I$with_oggvorbis_headers"
+AC_ARG_WITH(ogg_headers, [AC_HELP_STRING(--with-ogg-headers=dir,
+       [look for ogg headers also in dir])])
+AC_ARG_WITH(ogg_libs, [AC_HELP_STRING(--with-ogg-libs=dir,
+       [look for ogg libs also in dir])])
+AC_ARG_WITH(vorbis_headers, [AC_HELP_STRING(--with-vorbis-headers=dir,
+       [look for vorbis headers also in dir])])
+AC_ARG_WITH(vorbis_libs, [AC_HELP_STRING(--with-vorbis-libs=dir,
+       [look for vorbis libs also in dir])])
+AC_ARG_WITH(speex_headers, [AC_HELP_STRING(--with-speex-headers=dir,
+       [look for speex headers also in dir])])
+AC_ARG_WITH(speex_libs, [AC_HELP_STRING(--with-speex-libs=dir,
+       [look for speex libs also in dir])])
+
+if test -n "$with_ogg_headers"; then
+       ogg_cppflags="-I$with_ogg_headers"
        CPPFLAGS="$CPPFLAGS $ogg_cppflags"
 fi
-AC_ARG_WITH(oggvorbis_libs, [AC_HELP_STRING(--with-oggvorbis-libs=dir,
-       [look for ogg/vorbis/speex libs also in dir])])
-if test -n "$with_oggvorbis_libs"; then
-       ogg_libs="-L$with_oggvorbis_libs"
+if test -n "$with_ogg_libs"; then
+       ogg_libs="-L$with_ogg_libs"
        LDFLAGS="$LDFLAGS $ogg_libs"
 fi
-
-AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
-AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_vorbis="no" ])
-AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
 AC_CHECK_HEADERS([ogg/ogg.h], [], [ have_ogg="no"; ])
-AC_CHECK_HEADERS([vorbis/codec.h], [], [ have_vorbis="no" ])
-AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
+AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
+
+have_vorbis="yes"
+have_speex="yes"
+if test "$have_ogg" = "yes"; then
+       # vorbis
+       if test -n "$with_vorbis_headers"; then
+               vorbis_cppflags="-I$with_vorbis_headers"
+               CPPFLAGS="$CPPFLAGS $vorbis_cppflags"
+       fi
+       if test -n "$with_vorbis_libs"; then
+               vorbis_libs="-L$with_vorbis_libs"
+               LDFLAGS="$LDFLAGS $vorbis_libs"
+       fi
+       AC_CHECK_HEADERS([vorbis/codec.h], [], [ have_vorbis="no" ])
+       AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_vorbis="no" ])
+
+       # speex
+       if test -n "$with_speex_headers"; then
+               speex_cppflags="-I$with_speex_headers"
+               CPPFLAGS="$CPPFLAGS $speex_cppflags"
+       fi
+       if test -n "$with_speex_libs"; then
+               speex_libs="-L$with_speex_libs"
+               LDFLAGS="$LDFLAGS $speex_libs"
+       fi
+       AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
+       AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
+else
+       have_vorbis="no"
+       have_speex="no"
+fi
+
 msg="support in para_server/para_filter/para_afh"
-if test "$have_ogg" = "yes" && { test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; }; then
+if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
        AC_SUBST(ogg_cppflags)
        ogg_libs="$ogg_libs -logg"
        if test "$OSTYPE" = "Darwin"; then
-               ogg_libs="-Wl,-bind_at_load $ogg_libs $ogg_libs"
+               ogg_libs="-Wl,-bind_at_load $ogg_libs"
        fi
        server_ldflags="$server_ldflags $ogg_libs"
        filter_ldflags="$filter_ldflags $ogg_libs"
        audiod_ldflags="$audiod_ldflags $ogg_libs"
-       all_errlist_objs="$all_errlist_objs ogg_afh_common"
        afh_ldflags="$afh_ldflags $ogg_libs"
+       all_errlist_objs="$all_errlist_objs ogg_afh_common"
        afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
        server_errlist_objs="$server_errlist_objs ogg_afh_common"
-       if test "$have_vorbis" = "yes"; then
-               all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"
-               AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
-               filters="$filters oggdec"
-               vorbis_libs="-lvorbis -lvorbisfile"
-               server_ldflags="$server_ldflags $vorbis_libs"
-               filter_ldflags="$filter_ldflags $vorbis_libs"
-               audiod_ldflags="$audiod_ldflags $vorbis_libs"
-               afh_ldflags="$afh_ldflags $vorbis_libs"
-
-               server_errlist_objs="$server_errlist_objs ogg_afh"
-               filter_errlist_objs="$filter_errlist_objs oggdec_filter"
-               audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
-               afh_errlist_objs="$afh_errlist_objs ogg_afh"
-
-               audiod_audio_formats="$audiod_audio_formats ogg"
-               server_audio_formats="$server_audio_formats ogg"
-       else
-               AC_MSG_WARN([no ogg/vorbis $msg])
-       fi
-       if test "$have_speex" = "yes"; then
-               all_errlist_objs="$all_errlist_objs spxdec_filter spx_afh spx_common"
-               AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
-               filters="$filters spxdec"
-               speex_libs="-lspeex"
-               server_ldflags="$server_ldflags $speex_libs"
-               filter_ldflags="$filter_ldflags $speex_libs"
-               audiod_ldflags="$audiod_ldflags $speex_libs"
-               afh_ldflags="$afh_ldflags $speex_libs"
-
-               server_errlist_objs="$server_errlist_objs spx_afh spx_common"
-               filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
-               audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
-               afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
-
-               audiod_audio_formats="$audiod_audio_formats spx"
-               server_audio_formats="$server_audio_formats spx"
-       else
-               AC_MSG_WARN([no ogg/speex $msg])
-       fi
 else
-       AC_MSG_WARN([no ogg/vorbis ogg/speex $msg])
+       AC_MSG_WARN([vorbis/speex require ogg])
+fi
+if test "$have_vorbis" = "yes"; then
+       all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"
+       AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
+       filters="$filters oggdec"
+       vorbis_libs="-lvorbis -lvorbisfile"
+       server_ldflags="$server_ldflags $vorbis_libs"
+       filter_ldflags="$filter_ldflags $vorbis_libs"
+       audiod_ldflags="$audiod_ldflags $vorbis_libs"
+       afh_ldflags="$afh_ldflags $vorbis_libs"
+
+       server_errlist_objs="$server_errlist_objs ogg_afh"
+       filter_errlist_objs="$filter_errlist_objs oggdec_filter"
+       audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
+       afh_errlist_objs="$afh_errlist_objs ogg_afh"
+
+       audiod_audio_formats="$audiod_audio_formats ogg"
+       server_audio_formats="$server_audio_formats ogg"
+else
+       AC_MSG_WARN([no ogg/vorbis $msg])
+fi
+if test "$have_speex" = "yes"; then
+       all_errlist_objs="$all_errlist_objs spxdec_filter spx_afh spx_common"
+       AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
+       filters="$filters spxdec"
+       speex_libs="-lspeex"
+       server_ldflags="$server_ldflags $speex_libs"
+       filter_ldflags="$filter_ldflags $speex_libs"
+       audiod_ldflags="$audiod_ldflags $speex_libs"
+       afh_ldflags="$afh_ldflags $speex_libs"
+
+       server_errlist_objs="$server_errlist_objs spx_afh spx_common"
+       filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
+       audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
+       afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
+
+       audiod_audio_formats="$audiod_audio_formats spx"
+       server_audio_formats="$server_audio_formats spx"
+else
+       AC_MSG_WARN([no ogg/speex $msg])
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"

diff --git a/gui.c b/gui.c
index 38addd9815cc5bf2775c80278679a1e9c64e872e..3c1889ca51ae44fa89fdea7999aad0dcd31dcb33 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -33,10 +33,10 @@ static int signal_pipe;
 
 static struct win_data {
        WINDOW *win;
-       NCURSES_SIZE_T begx;
-       NCURSES_SIZE_T begy;
-       NCURSES_SIZE_T cols;
-       NCURSES_SIZE_T lines;
+       size_t begx;
+       size_t begy;
+       size_t cols;
+       size_t lines;
 } top, bot, sb, in, sep;
 
 #define RINGBUFFER_SIZE 512