Merge remote-tracking branch 'origin/patches-2.0'

diff --cc Makefile.am
Simple merge

diff --cc configure.in
index 46e473c5f013161116870426b1b020becd2a118d,cbc0d2189086c3737381b2a511db09ac7afb39a9..7e7c217b24d390cc3d7bcabc2865dfdb2ad15912
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -39,9 -28,10 +39,10 @@@ dnl the 'host' machine is where the res
  
  dnl Checks for programs.
  AC_PROG_CC
+ AM_PROG_CC_C_O
  AC_PROG_INSTALL
  AC_PROG_LN_S
 -AC_PROG_MKDIR_P
 +# AC_PROG_MKDIR_P - $(MKDIR_P) should be defined by AM_INIT_AUTOMAKE
  
  AC_PROG_GCC_TRADITIONAL