X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/4bc8424a9fde81305a5bcd04708492f3a067b438..25f3ce6a509ff9e3a354303023cb2028e9f83b95:/configure.ac

diff --git a/configure.ac b/configure.ac
index 042c7c32..b4f73896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,7 @@ m4_define([catacomb_DEFINE_CPU_OR_ABI],
 	;;m4_define([catacomb_seen_$3/$$2], [t])])])
   catacomb_CPU_FAMILIES([_def])
   nil) ;;
-  *) AC_MSG_ERROR([BUG: unexpected $1 \`$1']) ;;
+  *) AC_MSG_ERROR([BUG: unexpected $1 \`$$1']) ;;
 esac])
 
 dnl Now that's out the way, we can explain what we're doing.
@@ -158,17 +158,6 @@ catacomb_DEFINE_CPU_OR_ABI([CPUFAM], [2], [cpu],
 catacomb_DEFINE_CPU_OR_ABI([ABI], [3], [abi],
   [ABI_], [Define if target ABI is \`$][3\'.])
 
-AC_ARG_ENABLE([asm-debug],
-  AS_HELP_STRING([--enable-asm-debug],
-    [enable assembler debugging features]),
-  [mdw_asm_debug=$enableval], [mdw_asm_debug=no])
-case $CPUFAM in nil) mdw_asm_debug=no ;; esac
-case mdw_asm_debug in
-  no) ;;
-  *) AC_DEFINE([ENABLE_ASM_DEBUG], [1],
-       [Define to enable assembler-level debugging.]) ;;
-esac
-
 dnl Establish Automake conditions for things.
 catacomb_CPU_FAMILIES([catacomb_CLEAR_FLAGS])
 m4_define([catacomb_COND_CPU],
@@ -183,7 +172,6 @@ m4_ifdef([catacomb_seen_abi/$3], [],
 m4_define([catacomb_seen_abi/$3], [t])])])
 catacomb_CPU_FAMILIES([catacomb_COND_CPU])
 AM_CONDITIONAL([KNOWN_CPUFAM], [test x$CPUFAM != xnil])
-AM_CONDITIONAL([ASM_DEBUG], [test x$mdw_asm_debug != xno])
 
 dnl Report on what we found.
 case $CPUFAM in
@@ -191,6 +179,26 @@ case $CPUFAM in
   *) AC_MSG_RESULT([$CPUFAM/$ABI]) ;;
 esac
 
+dnl Consider enabling support for assembler-level debugging toys.
+AC_ARG_ENABLE([asm-debug],
+  AS_HELP_STRING([--enable-asm-debug],
+    [enable assembler debugging features]),
+  [mdw_asm_debug=$enableval], [mdw_asm_debug=no])
+case $CPUFAM in nil) mdw_asm_debug=no ;; esac
+case $mdw_asm_debug in
+  no) ;;
+  *) AC_DEFINE([ENABLE_ASM_DEBUG], [1],
+       [Define to enable assembler-level debugging.]) ;;
+esac
+AM_CONDITIONAL([ASM_DEBUG], [test x$mdw_asm_debug != xno])
+
+dnl Check for leading underscores on C symbols.
+LT_SYS_SYMBOL_USCORE
+case $sys_symbol_underscore in
+  yes) AC_DEFINE([SYM_USCORE], [1],
+	 [Define if C symbols are prefixed with an underscore.]) ;;
+esac
+
 dnl--------------------------------------------------------------------------
 dnl CPU-specific assembler features.
 
@@ -415,7 +423,7 @@ dnl Set the master libraries we need.
 AC_SUBST([CATACOMB_LIBS])
 
 dnl Necessary support libraries.
-PKG_CHECK_MODULES([mLib], [mLib >= 2.3.0])
+PKG_CHECK_MODULES([mLib], [mLib >= 2.4.1])
 AM_CFLAGS="$AM_CFLAGS $mLib_CFLAGS"
 
 dnl--------------------------------------------------------------------------