Merge branch 't/configure_improvements'

diff --combined Makefile.in
index 7e21745a433fb3d0d88d069e13c0e16fc7df0f32,ff5150b6e2f1f22904665e234ffc5ace51cecf01..8963adad3b7339a1ff6b750f69b597acde1c49f6
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -9,19 -9,15 +9,19 @@@ PACKAGE_VERSION := @PACKAGE_VERSION
  PACKAGE_STRING := @PACKAGE_STRING@
  install_sh := @install_sh@
  cmdline_dir := @cmdline_dir@
 +executables := @executables@
  
  build_date := $(shell date)
  uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
  uname_rs := $(shell uname -rs)
  cc_version := $(shell $(CC) --version | head -n 1)
 -codename := deterministic entropy
 +codename := infinite rollback
  
  DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
  DEBUG_CPPFLAGS += -Wredundant-decls
 +DEBUG_CPPFLAGS += -Wall
 +DEBUG_CPPFLAGS += -Wformat-security
 +DEBUG_CPPFLAGS += -Wmissing-format-attribute
  # produces false positives
  # DEBUG_CPPFLAGS += -Wunreachable-code
  # DEBUG_CPPFLAGS += -Wwrite-strings
@@@ -41,21 -37,23 +41,20 @@@ ifeq ($(uname_s),Linux
        CPPFLAGS += -Wshadow
  endif
  CPPFLAGS += -Os
 -CPPFLAGS += -Wall
  CPPFLAGS += -Wuninitialized
  CPPFLAGS += -Wchar-subscripts
 -CPPFLAGS += -Wformat-security
  CPPFLAGS += -DBINDIR='"$(BINDIR)"'
  CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
  CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
  CPPFLAGS += -DCODENAME='"$(codename)"'
  CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
  CPPFLAGS += -Werror-implicit-function-declaration
 -CPPFLAGS += -Wmissing-format-attribute
  CPPFLAGS += -Wmissing-noreturn
  CPPFLAGS += -Wunused-macros
  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)
@@@ -68,7 -66,6 +67,7 @@@ man_pages_in := $(patsubst %, web/%.man
  ggo_dir := ggo
  object_dir := objects
  man_dir := man/man1
 +test_dir := t
  
  m4_ggos := afh audioc audiod client filter gui recv server write
  all_ggos := $(m4_ggos) dccp_recv alsa_write oss_write fade http_recv \
@@@ -95,10 -92,10 +94,10 @@@ endi
  ifndef BUILD_VERBOSE
        BUILD_VERBOSE = 0
  endif
 -ifeq ($(BUILD_VERBOSE),1)
 -      Q =
 -else
 +ifeq ($(BUILD_VERBOSE),0)
        Q = @
 +else
 +      Q =
  endif
  
  .PHONY: dep all clean distclean maintainer-clean install man tarball\
@@@ -196,6 -193,10 +195,10 @@@ $(object_dir)/aac_afh.o: aac_afh.c | $(
        @[ -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 -213,7 +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 -249,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 $@'
@@@ -282,7 -284,7 +286,7 @@@ clean2: clea
        $(Q) rm -rf man $(object_dir)
        $(Q) rm -f *_command_list.*
  
 -distclean: clean2
 +distclean: clean2 test-clean
        @[ -z "$(Q)" ] || echo 'DISTCLEAN'
        $(Q) rm -f Makefile autoscan.log config.status config.log
        $(Q) rm -rf autom4te.cache aclocal.m4
@@@ -318,4 -320,3 +322,4 @@@ $(tarball): $(cmdline_generated
  %.pdf: %.ps
        ps2pdf - - < $< > $@
  
 +include $(test_dir)/makefile.test