-dnl Copyright © 2019 Nick Bowler
+dnl Copyright © 2019-2021 Nick Bowler
dnl
dnl Based on original work Copyright © 1999-2013 Jiri (George) Lebl.
dnl
dnl This is free software: you are free to change and redistribute it.
dnl There is NO WARRANTY, to the extent permitted by law.
-AC_INIT([gob-dx], [2.0.20a], [nbowler@draconx.ca])
+AC_INIT([GObject Builder], [2.0.20a], [nbowler@draconx.ca], [gob-dx])
AC_CONFIG_SRCDIR([src/treefuncs.def])
+AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([-Wall subdir-objects dist-xz])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability subdir-objects dist-xz])
AM_SILENT_RULES([yes])
+DX_AUTOMAKE_COMPAT
AC_PROG_CC
+gl_EARLY
+
AC_PROG_CXX
-AC_PROG_LEX
AC_PROG_YACC
+LT_INIT
+gl_INIT
+
+AC_CACHE_SAVE
+
+m4_include([lib/gnulib.mk])
+
AC_ARG_VAR([PERL], [command to execute perl programs])
AC_CHECK_PROGS([PERL], [perl], [false])
AM_CONDITIONAL([HAVE_PERL], [$PERL -e 'my $x = 42; exit $x'; test $? = 42])
-LT_INIT
+DX_PROG_FLEX([], [have_flex=yes], [have_flex=no])
+AM_CONDITIONAL([HAVE_FLEX], [test x"$have_flex" = x"yes"])
DX_LIB_GLIB2
DX_PROG_AUTOTEST
AM_CONDITIONAL([HAVE_AUTOTEST], [test x"$dx_cv_autotest_works" = x"yes"])
-AC_CONFIG_FILES([Makefile gob2.spec doc/gob2.1 atlocal])
+AC_CONFIG_FILES([Makefile gob2.spec doc/gob2.1])
AC_OUTPUT