diff configure.ac @ 249:6b2441c776dd

*: merge
author Paper <mrpapersonic@gmail.com>
date Wed, 24 Jan 2024 20:18:59 -0500
parents 1ae4d8b28a5c 06d6c351925c
children c130f47f6f48
line wrap: on
line diff
--- a/configure.ac	Wed Jan 24 20:18:14 2024 -0500
+++ b/configure.ac	Wed Jan 24 20:18:59 2024 -0500
@@ -2,6 +2,7 @@
 
 AC_CANONICAL_HOST
 
+AC_CONFIG_SUBDIRS([dep/pugixml dep/animia dep/anitomy])
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIRS([m4])
@@ -9,9 +10,11 @@
 AM_INIT_AUTOMAKE([-Wall -Wportability foreign subdir-objects])
 
 # Do we have a C++17 compiler
+: ${CXXFLAGS=""}
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX(17, noext, mandatory)
+AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
 
+# Init libtool
 AM_PROG_AR
 LT_INIT
 
@@ -26,7 +29,7 @@
 AC_PROG_MKDIR_P
 
 # libcurl?
-LIBCURL_CHECK_CONFIG(yes, 7.7.2, [have_libcurl=yes], [have_libcurl=no])
+LIBCURL_CHECK_CONFIG([yes], [7.7.2], [have_libcurl=yes], [have_libcurl=no])
 
 if test "x$have_libcurl" = "xno"; then
 	AC_MSG_ERROR([*** libcurl not found.])
@@ -58,7 +61,7 @@
 		# Everything else
 		AC_SUBST([GIO_CFLAGS])
 		AC_SUBST([GIO_LIBS])
-		PKG_CHECK_MODULES(GIO, gio-2.0, [build_glib=yes], [])
+		PKG_CHECK_MODULES([GIO], [gio-2.0], [build_glib=yes], [])
 		;;
 esac
 
@@ -67,7 +70,5 @@
 AM_CONDITIONAL([BUILD_GLIB], [test "x$build_glib" = "xyes"])
 AM_CONDITIONAL([BUILD_WINDRES], [test "x$WINDRES" != "x"])
 
-AC_CONFIG_SUBDIRS([dep/pugixml dep/animia dep/anitomy])
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT