Merge eterwine into eterhack

Conflicts:
	configure
	configure.ac

diff --cc configure
index 34be96a764931fd25a4d6a5337aba4d5892384b5,7720fa0398f18f3dee8ddc545090c5371873122c..faddbe407c6edab3b766b9ce5108a0e042f95d67
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -790,8 -788,6 +791,7 @@@ with_gnutl
  with_gsm
  with_gstreamer
  with_hal
- with_icns
 +with_ieee1284
  with_jack
  with_jpeg
  with_ldap
@@@ -1482,8 -1477,6 +1482,7 @@@ Optional Packages
    --without-gsm           do not use libgsm (GSM 06.10 codec support)
    --without-gstreamer     do not use GStreamer (codecs support)
    --without-hal           do not use HAL (dynamic device support)
-   --without-icns          do not use ICNS icon support
 +  --without-ieee1284      do not use libieee1284
    --without-jack          do not use the Jack sound support
    --without-jpeg          do not use JPEG
    --without-ldap          do not use LDAP
@@@ -2644,18 -2636,6 +2643,12 @@@ if test "${with_hal+set}" = set; then 
  fi
  
  
- # Check whether --with-icns was given.
- if test "${with_icns+set}" = set; then :
-   withval=$with_icns; if test "x$withval" = "xno"; then ac_cv_header_icns_h=no; fi
- fi
- 
- 
 +# Check whether --with-ieee1284 was given.
 +if test "${with_ieee1284+set}" = set; then :
 +  withval=$with_ieee1284;
 +fi
 +
 +
  # Check whether --with-jack was given.
  if test "${with_jack+set}" = set; then :
    withval=$with_jack; if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi

diff --cc configure.ac
index 3a43f71fbf37fba720c75c9bac5bb3339d887c2d,488cf50963aadd1dedab61d85d362557c482c26f..56f780aeeb5e92c60d2eea299ec5ff1664e25c5a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -57,9 -57,6 +57,7 @@@ AC_ARG_WITH(gsm,       AS_HELP_STRING([
              [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi])
  AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreamer (codecs support)]))
  AC_ARG_WITH(hal,       AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
- AC_ARG_WITH(icns,      AS_HELP_STRING([--without-icns],[do not use ICNS icon support]),
-             [if test "x$withval" = "xno"; then ac_cv_header_icns_h=no; fi])
 +AC_ARG_WITH(ieee1284,  AS_HELP_STRING([--without-ieee1284],[do not use libieee1284]))
  AC_ARG_WITH(jack,      AS_HELP_STRING([--without-jack],[do not use the Jack sound support]),
              [if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi])
  AC_ARG_WITH(jpeg,      AS_HELP_STRING([--without-jpeg],[do not use JPEG]),

diff --cc dlls/wineps.drv/init.c
Simple merge

diff --cc dlls/winex11.drv/keyboard.c
Simple merge

diff --cc include/config.h.in
Simple merge