--- configure.ac.orig	2010-04-07 15:38:51.000000000 -0700
+++ configure.ac	2013-01-10 01:42:00.000000000 -0800
@@ -30,7 +30,7 @@
 
 AC_PREREQ(2.61)
 AC_INIT([MediaTomb], [0.12.1], [jin@mediatomb.cc])
-AM_CONFIG_HEADER([autoconfig.h tombupnp/upnp/inc/upnpconfig.h])
+AC_CONFIG_HEADERS([autoconfig.h tombupnp/upnp/inc/upnpconfig.h])
 AC_CONFIG_AUX_DIR(configure_aux)
 AC_CONFIG_SRCDIR([src/common.h])
 AM_INIT_AUTOMAKE([1.9 -Wall])
@@ -692,8 +692,7 @@
         AC_MSG_NOTICE([You are running OSX, assuming threadsafe gethostbyname version])
 elif test $CYGWIN_OS -eq 1; then
         AC_MSG_NOTICE([Your are building under Cygwin, assuming threadsafe gethostbyname implementation])
-fi
-
+else
 AC_CHECK_FUNCS([gethostbyname_r],[],
         [
             AC_CHECK_HEADERS([lwres/netdb.h],
@@ -712,6 +711,7 @@
                     fi
                 ])
         ])
+fi
 
 AC_CHECK_FUNCS([if_nameindex],[],
         [