X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/d23763dae4f649cc29a923298e0232ffdf608744..98ff9295493ed2b990f30768e11b18b6bc65eaa4:/configure.ac

diff --git a/configure.ac b/configure.ac
index 2b7bcd7..4d08050 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,9 @@ AC_DEFINE_UNQUOTED([SRCDIR], ["$(cd $srcdir && pwd)"],
 dnl--------------------------------------------------------------------------
 dnl C programming environment.
 
+dnl Set the master library list.
 MLIB_LIBS=
+AC_SUBST([MLIB_LIBS])
 
 dnl Headers.
 AC_CHECK_HEADERS([float.h])
@@ -90,9 +92,6 @@ AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
 dnl Floating-point formats.
 mdw_PROBE_FLTFMT
 
-dnl Set the master library list.
-AC_SUBST([MLIB_LIBS])
-
 dnl--------------------------------------------------------------------------
 dnl Terminal characteristics.
 
@@ -103,15 +102,20 @@ AC_ARG_WITH([unibilium],
   [want_unibilium=$withval],
   [want_unibilium=auto])
 
-case $want_unibilium in no) ;; *) have_unibilium=check ;; esac
+case $want_unibilium in
+  no) have_unibilium=no ;;
+  *) have_unibilium=check ;;
+esac
 case $have_unibilium in
   check)
     PKG_CHECK_MODULES([unibilium], [unibilium >= 2.0.0],
-		      [], [have_unibilium=no])
+      [CFLAGS="$CFLAGS $unibilium_CFLAGS"
+       LIBS="$LIBS $unibilium_LIBS"],
+      [have_unibilium=no])
     ;;
 esac
-case $have_unibilium in check) have_unibilium=yes ;; esac
 
+case $have_unibilium in check) have_unibilium=yes ;; esac
 case $want_unibilium,$have_unibilium in
   yes,no)
     AC_MSG_ERROR([`unibilium' library not found but explicitly requested])
@@ -132,7 +136,10 @@ AC_ARG_WITH([terminfo],
   [want_terminfo=$withval],
   [want_terminfo=auto])
 
-case $want_terminfo in no) ;; *) have_terminfo=check ;; esac
+case $want_terminfo in
+  no) have_terminfo=no ;;
+  *) have_terminfo=check ;;
+esac
 case $have_terminfo in
   check) AC_CHECK_HEADERS([term.h], [], [have_terminfo=no]) ;;
 esac
@@ -164,7 +171,10 @@ AC_ARG_WITH([termcap],
   [want_termcap=$withval],
   [want_termcap=auto])
 
-case $want_termcap in no) ;; *) have_termcap=check ;; esac
+case $want_termcap in
+  no) have_termcap=no ;;
+  *) have_termcap=check ;;
+esac
 case $have_termcap in
   check) AC_CHECK_HEADERS([termcap.h], [], [have_termcap=no]) ;;
 esac
@@ -268,10 +278,9 @@ AC_CONFIG_FILES(
   [sel/Makefile]
   [struct/Makefile]
   [sys/Makefile]
-  [test/Makefile]
-  [test/example/Makefile]
+  [test/Makefile] [test/example/Makefile]
   [trace/Makefile]
-  [ui/Makefile]
+  [ui/Makefile] [ui/example/Makefile]
   [utils/Makefile]
   [t/Makefile t/atlocal])
 AC_OUTPUT