--- a/configure.in
+++ b/configure.in
@@ -41,12 +41,12 @@
  CFLAGS="$CFLAGS  -g"
 fi
 AC_PROG_CC
-AC_CHECK_HEADERS([sys/ioctl.h], AC_DEFINE(HAVE_IOCTL))
-AC_CHECK_HEADERS([sys/termio.h], AC_DEFINE(HAVE_SYSTERMIO))
-AC_CHECK_HEADERS([termio.h], AC_DEFINE(HAVE_TERMIO))
-AC_CHECK_HEADERS([sys/winsize.h], AC_DEFINE(HAVE_WINSIZE))
-AC_CHECK_HEADERS([locale.h], AC_DEFINE(HAVE_LOCALE_H))
-AC_CHECK_HEADERS([libintl.h], AC_DEFINE(HAVE_LIBINTL_H))
+AC_CHECK_HEADERS([sys/ioctl.h], AC_DEFINE([HAVE_IOCTL], [], [Define if sys/ioctl.h is available]))
+AC_CHECK_HEADERS([sys/termio.h], AC_DEFINE([HAVE_SYSTERMIO], [], [Define is sys/termio.h is available]))
+AC_CHECK_HEADERS([termio.h], AC_DEFINE([HAVE_TERMIO], [], [Define if termio.h is available]))
+AC_CHECK_HEADERS([sys/winsize.h], AC_DEFINE([HAVE_WINSIZE], [], [Define if sys/winsize.h is available]))
+AC_CHECK_HEADERS([locale.h], AC_DEFINE([HAVE_LOCALE_H], [], [Define if locale.h is available]))
+AC_CHECK_HEADERS([libintl.h], AC_DEFINE([HAVE_LIBINTL_H], [], [Define if libintl.h is available]))
 AC_CHECK_HEADERS(getopt.h, [
  AC_SEARCH_LIBS(getopt_long, gnugetopt, [],
      [AC_MSG_ERROR("You need to get libgnugetopt or a newer GNU libc.")]
@@ -61,6 +61,7 @@
     )]
 )
 
+AM_GNU_GETTEXT_VERSION([0.12.1])
 AM_GNU_GETTEXT([external])
 
 dnl $with_ssl can be one of:
@@ -137,8 +138,8 @@
 		])
 
 		if test "x$gnutls_libs" != "xno"; then
-			AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GNUTLS])
-			AC_DEFINE(HAVE_SSL)
+			AC_DEFINE([HAVE_GNUTLS], [1], [Define if you have GNUTLS])
+			AC_DEFINE([HAVE_SSL], [], [Define if SSL is available])
 			msg_gnutls="GNUTLS"
 			GNUTLS_LIBS="$with_gnutls_libs -lgnutls-openssl"
 
@@ -156,7 +157,7 @@
 	GNUTLS_LIBS=""
 fi
 
-AC_CHECK_TYPES([long long, unsigned long long], AC_DEFINE(HAVE_LONG_LONG))
+AC_CHECK_TYPES([long long, unsigned long long], AC_DEFINE([HAVE_LONG_LONG]))
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(short)
 host_os=`uname`