sr: Name all callback data 'cb_data'.

[sigrok-gtk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e75cbda4be56d4bc78e704be20ee717751f54869..31bb9020be9374f663fe60487813e90a1cd26486 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AC_PREREQ([2.61])
+# We require at least autoconf 2.63 (AC_INIT format changed there).
+AC_PREREQ([2.63])
 
 AC_INIT([sigrok-gtk], [0.1], [gareth@blacksphere.co.nz],
         [sigrok-gtk], [http://www.sigrok.org])
@@ -26,7 +27,8 @@ AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign std-options])
+# We require at least automake 1.11 (needed for 'silent rules').
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AH_TOP([#ifndef SIGROK_GTK_CONFIG_H
@@ -55,7 +57,7 @@ PKG_CHECK_MODULES([gtk], [gtk+-2.0 gmodule-2.0],
        [CFLAGS="$CFLAGS $gtk_CFLAGS";
        LIBS="$LIBS $gtk_LIBS"])
 
-PKG_CHECK_MODULES([libsigrok], [libsigrok],
+PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2],
        [CFLAGS="$CFLAGS $libsigrok_CFLAGS";
        LIBS="$LIBS $libsigrok_LIBS"])
 
@@ -78,7 +80,11 @@ AC_TYPE_SIZE_T
 # Checks for library functions.
 AC_CHECK_FUNCS([memset strtoull])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile
+                contrib/Makefile
+                contrib/sigrok-gtk.nsi
+                doc/Makefile
+               ])
 
 AC_OUTPUT