gl-patches: Don't force HAVE_LONG_LONG_INT.

[dxcommon.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cf152d889e9029147c6604c3a850dd13463e2cfd..b10b6258a9e929887cae333a595ade8da5e2062a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,12 @@ AC_PREREQ([2.68])
 AC_INIT([dxcommon], [0], [nbowler@draconx.ca])
 AC_CONFIG_SRCDIR([m4/base.m4])
 
+DX_INIT([.])
+
+AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects])
+AM_SILENT_RULES([yes])
+DX_AUTOMAKE_COMPAT
+
 # To ensure automake --add-missing copies config.guess/config.sub
 AC_CANONICAL_HOST
 
@@ -15,11 +21,6 @@ AC_PROG_CC
 AC_PROG_RANLIB
 AC_PROG_AWK
 
-AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects])
-AM_SILENT_RULES([yes])
-
-DX_INIT([.])
-
 AC_USE_SYSTEM_EXTENSIONS
 AC_C_INLINE
 
@@ -28,9 +29,8 @@ AC_SUBST([STUB_INCLUDES], [@&t@])
 AC_CHECK_FUNCS_ONCE([wcwidth])
 AM_CONDITIONAL([HAVE_WCWIDTH], [test x"$ac_cv_func_wcwidth" = x"yes"])
 
-AC_CONFIG_TESTDIR([.])
-DX_PROG_AUTOTEST
-AM_CONDITIONAL([HAVE_AUTOTEST], [test x"$dx_cv_autotest_works" = x"yes"])
+AC_CONFIG_TESTDIR([.], [t:$srcdir/t])
+DX_PROG_AUTOTEST_AM
 
 AC_CACHE_CHECK([for struct option in <getopt.h>], [dx_cv_have_struct_option],
   [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <getopt.h>],