--- configure.ac.orig	2012-08-13 02:35:26.000000000 -0500
+++ configure.ac	2013-02-07 18:07:04.000000000 -0600
@@ -56,7 +56,7 @@
 dnl> generate the config header
 dnl>
 umask 002
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
 HAS_ERROR=
 HAS_WARNING=
@@ -324,23 +324,6 @@
 echo
 echo "Checking C compiler program and features..."
 echo
-AM_PROG_CC_STDC
-if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
-    echo
-    echo "*******************************************************************"
-    echo "*"
-    echo "* WARNING: Attempting to configure for non ANSI standard C."
-    echo "*"
-    echo "*>>> This is unsupported."
-    echo "*>>> It will probably fail."
-    echo "*"
-    echo "*    You are welcome to try - but please, keep the ntop-dev"
-    echo "*    mailing list updated with your successes or failures..."
-    echo "*"
-    echo "*******************************************************************"
-    echo
-    HAS_WARNING="yes"
-fi
 
 dnl> NTOPCONFIGDEBUG_SETTINGS([After cc stdc test])
 
@@ -469,10 +452,6 @@
     LOCALEDIR="/usr/lib/locale"
 fi
 
-dnl> Add /usr/local/ /opt/local
-CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
 
 PWD=`pwd`
 
@@ -1465,25 +1444,8 @@
 dnl> PYTHON
 dnl>
   AC_CHECK_TOOL(PYTHON, python-config)
-  PYTHON_CONFIG=""
+  PYTHON_CONFIG="$ac_cv_prog_ac_ct_PYTHON"
 
-  if test "x$ac_cv_prog_ac_ct_PYTHON" != "xpython-config"; then   
-       if test -f "/etc/debian_version"; then
-       	   AC_MSG_RESULT(Please install python-dev and rerun configure)
-	   exit 1
-	else
-	AC_MSG_RESULT(>>>> Unable to locate python-config: using workaround <<<<)
-        dnl> Silly workaround for RedHat-like distro
-        AC_CHECK_TOOL(PYTHON, python)
-        if test "x$ac_cv_prog_ac_ct_PYTHON" = "xpython"; then
-          PYTHON_CONFIG="./configureextra/python-config"
-        else
-          PYTHON_CONFIG="python-config"
-        fi
-     fi
-  else
-     PYTHON_CONFIG="python-config"
-  fi
 
   if test "x$PYTHON_CONFIG" != "x"; then
     PYTHON_LIBS="`$PYTHON_CONFIG --libs`"
@@ -1981,22 +1943,8 @@
 echo "#endif /* MEMORY_DEBUG */" >> version.c
 
 case "${host}" in
-    *darwin* )
-	if test -f /usr/bin/glibtool; then
-		ln -s  /usr/bin/glibtool libtool
-		echo
-		echo "Copying patched versions of some configure-related files for Mac OS X"
-        	cp packages/MacOSX/lt* .
-		rm -f libtool
-	else
-		if test -f /usr/bin/libtool; then
-			ln -s  /usr/bin/libtool libtool
-		fi 		
-	fi
-        echo
-        ;;
 	*)
-	LIBTOOL_PATH="/usr/bin/libtool"
+	LIBTOOL_PATH="${prefix}/bin/glibtool"
 	if test -x ${LIBTOOL_PATH}; then
 	   rm -f libtool
 	   ln -s ${LIBTOOL_PATH} libtool