X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=4e8dea88e1686df7d43e560240e3719a60051910;hb=1fe3e6cc2add04d9a4b7fd314cf75b619594b127;hp=e75cbda4be56d4bc78e704be20ee717751f54869;hpb=dffa99f7923206bc6566f1731e2ff34acc5822e6;p=sigrok-gtk.git

diff --git a/configure.ac b/configure.ac
index e75cbda..4e8dea8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 ##
-## This file is part of the sigrok project.
+## This file is part of the sigrok-gtk project.
 ##
 ## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
 ##
@@ -17,28 +17,34 @@
 ## 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],
+AC_INIT([sigrok-gtk], [0.1.0], [gareth@blacksphere.co.nz],
         [sigrok-gtk], [http://www.sigrok.org])
 
 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 std-options check-news])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AH_TOP([#ifndef SIGROK_GTK_CONFIG_H
 #define SIGROK_GTK_CONFIG_H    /* To stop multiple inclusions. */])
 AH_BOTTOM([#endif /* SIGROK_GTK_CONFIG_H */])
 
-CFLAGS="-g -Wall -Wextra"
+# Enable more compiler warnings via -Wall and -Wextra.
+CFLAGS="$CFLAGS -Wall -Wextra"
 
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 
+# Needed for per-target flags or subdir-objects with C sources.
+AM_PROG_CC_C_O
+
 # Initialize libtool.
 LT_INIT
 
@@ -55,7 +61,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.0],
 	[CFLAGS="$CFLAGS $libsigrok_CFLAGS";
 	LIBS="$LIBS $libsigrok_LIBS"])
 
@@ -78,7 +84,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