progs/mkphrase.c: Fix trailing spaces in usage message.

[catacomb] / configure.ac

diff --git a/configure.ac b/configure.ac
index 308e457..e5bf8d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,13 @@ AC_PROG_CC
 AX_CFLAGS_WARN_ALL
 AM_PROG_LIBTOOL
 mdw_LIBTOOL_VERSION_INFO
+case $host_os in
+  cygwin* | mingw* | pw32* | os2* | darwin* | cegcc*)
+    TEST_LDFLAGS=-no-fast-install ;;
+  *)
+    TEST_LDFLAGS=-no-install ;;
+esac
+AC_SUBST([TEST_LDFLAGS])
 
 AM_PROG_AS
 
@@ -145,7 +152,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.
@@ -172,7 +179,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
@@ -186,11 +192,19 @@ AC_ARG_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
+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.
@@ -416,7 +430,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--------------------------------------------------------------------------