Replace gnulib patch with new common helper macro.

[gob-dx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f3e4b913b4925b9326cc375f8ec88c1afdba4ff1..fe3dae92897969be90707816c537af3c8b016485 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright © 2019-2020 Nick Bowler
+dnl Copyright © 2019-2023 Nick Bowler
 dnl
 dnl Based on original work Copyright © 1999-2013 Jiri (George) Lebl.
 dnl
@@ -6,24 +6,36 @@ dnl License GPLv2+: GNU General Public License version 2 or any later version.
 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])
+DX_PATCH_GNULIB
+
+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
 
@@ -31,6 +43,31 @@ dnl Dependencies for test suite
 DX_LIB_GLIB2([], [gobject], [HAVE_GOBJECT=true], [HAVE_GOBJECT=false])
 AC_SUBST([HAVE_GOBJECT])
 
+save_LIBS=$LIBS
+LIBS="$LIBS $LIBGLIB_LIBS"
+AC_CHECK_FUNCS([g_string_append_printf g_ascii_strcasecmp])
+LIBS=$save_LIBS
+
+AM_CONDITIONAL([GOB_STRCASE], [test x"$ac_cv_func_g_ascii_strcasecmp" = x"no"])
+
+AS_IF([$HAVE_GOBJECT],
+  [AC_CACHE_CHECK([whether libgobject supports private data members],
+    [dx_cv_libgobject_privates],
+[save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS $LIBGOBJECT_CFLAGS"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+[#include <glib-object.h>
+#if defined(G_ADD_PRIVATE) || defined(G_TYPE_INSTANCE_GET_PRIVATE)
+#else
+DX_LIB_COMPILE_ERROR([private members not supported])
+#endif
+])], [dx_cv_libgobject_privates=yes], [dx_cv_libgobject_privates=no])
+CFLAGS=$save_CFLAGS])])
+
+AS_IF([test x"$dx_cv_libgobject_privates" = x"yes"],
+  [HAVE_GOBJECT_PRIVATES=true], [HAVE_GOBJECT_PRIVATES=false])
+AC_SUBST([HAVE_GOBJECT_PRIVATES])
+
 DX_LIB_GTK2([], [HAVE_GTK2=true], [HAVE_GTK2=false])
 AC_SUBST([HAVE_GTK2])
 
@@ -38,5 +75,5 @@ AC_CONFIG_TESTDIR([.], [t:.])
 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