aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 78fbc8c9..a835e104 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,10 @@
# configure.ac
+<<<<<<< HEAD
+AC_INIT([tmux], next-3.2)
+=======
AC_INIT([tmux], 3.1-rc3)
+>>>>>>> 3.1-rc
AC_PREREQ([2.60])
AC_CONFIG_AUX_DIR(etc)
@@ -87,6 +91,9 @@ AC_CHECK_HEADERS([ \
util.h \
])
+# Look for fmod.
+AC_CHECK_LIB(m, fmod)
+
# Look for library needed for flock.
AC_SEARCH_LIBS(flock, bsd)