Merge eterwine into eterhack

Conflicts:
	include/config.h.in

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dlls/winejack.drv/audio.c
index da04824af55370cd4c280da65a25d0a4a7755efa,ac8a0c066801aeb783fbd97b097179b3f681fccd..5d339eeac820f7e333f4ffb55eba1b803a027904
--- 1/dlls/winejack.drv/audio.c
--- 2/dlls/winejack.drv/audio.c
+++ b/dlls/winejack.drv/audio.c
@@@ -34,6 -34,6 +34,7 @@@
   */
  
  #include "config.h"
++#include "wine/port.h"
  
  #include <stdlib.h>
  #include <stdarg.h>
@@@ -47,6 -47,6 +48,7 @@@
  #include "winbase.h"
  #include "winnls.h"
  #include "wingdi.h"
++#include "winuser.h"
  #include "winerror.h"
  #include "mmddk.h"
  #include "dsound.h"

diff --cc include/config.h.in
index fd0671dcd09168567c33b69b062f47f29ee8d225,b7460cc00080682be072b89f1941c47d958b3d63..403d85dde75aac93307021eb4b6354db6bbb4b82
--- 1/include/config.h.in
--- 2/include/config.h.in
+++ b/include/config.h.in
@@@ -512,12 -503,6 +506,9 @@@
  /* Define to 1 if you have the <mpg123.h> header file. */
  #undef HAVE_MPG123_H
  
- /* Define if you have NAS including devel headers */
- #undef HAVE_NAS
- 
 +/* Define to 1 if you have the <ncursesw/ncurses.h> header file. */
 +#undef HAVE_NCURSESW_NCURSES_H
 +
  /* Define to 1 if you have the <ncurses.h> header file. */
  #undef HAVE_NCURSES_H