X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=8fbfd451188525c2e4811ce4a1f0ce8fd9ae0b24;hp=f2bf69d9eaffe234f1a47bb61255dea7fd071200;hb=03a66522d5aef7b49fbf63e4da475c4ab8b1fe2e;hpb=aa56f7ad4f6238fd994b37bf61ba0efa052c14d5

diff --git a/configure.ac b/configure.ac
index f2bf69d..8fbfd45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,11 +17,12 @@
 ## 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])
 
 # libsigrokdecode package version number (NOT the same as shared lib version!).
 m4_define([libsigrokdecode_major_version], [0])
-m4_define([libsigrokdecode_minor_version], [2])
+m4_define([libsigrokdecode_minor_version], [1])
 m4_define([libsigrokdecode_micro_version], [0])
 m4_define([libsigrokdecode_version],
 	  [libsigrokdecode_major_version.libsigrokdecode_minor_version.libsigrokdecode_micro_version])
@@ -33,7 +34,8 @@ AC_CONFIG_HEADER([config.h])
 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 LIBSIGROKDECODE_CONFIG_H
@@ -65,6 +67,10 @@ LIBSIGROKDECODE_LT_REVISION=0
 LIBSIGROKDECODE_LT_AGE=0
 LIBSIGROKDECODE_LT_VERSION="$LIBSIGROKDECODE_LT_CURRENT:$LIBSIGROKDECODE_LT_REVISION:$LIBSIGROKDECODE_LT_AGE"
 LIBSIGROKDECODE_LT_LDFLAGS="-version-info $LIBSIGROKDECODE_LT_VERSION"
+AC_SUBST(LIBSIGROKDECODE_LT_CURRENT)
+AC_SUBST(LIBSIGROKDECODE_LT_REVISION)
+AC_SUBST(LIBSIGROKDECODE_LT_AGE)
+AC_SUBST(LIBSIGROKDECODE_LT_VERSION)
 AC_SUBST(LIBSIGROKDECODE_LT_LDFLAGS)
 
 # Checks for libraries.
@@ -76,38 +82,30 @@ AM_PATH_GLIB_2_0([2.22.0],
         [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # Python support. We require at least Python >= 3.0.
+AC_ARG_VAR([PYTHON3_CONFIG], [path to python3-config utility])
+AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.2-config python3.1-config python3.0-config])
 CPPFLAGS_PYTHON=""
 LDFLAGS_PYTHON=""
 case "$build" in
-*linux*)
-	# We know that Linux has 'python3-config'.
-	CPPFLAGS_PYTHON="$(python3-config --includes)"
-	LDFLAGS_PYTHON="$(python3-config --ldflags)"
-	;;
-*darwin*)
-	# On Darwin, Macports has python3.x-config, fink has python3-config.
-	# Mac OS X (Snow Leopard) ships with 'python-config' per default, but
-	# that's Python 2.x, so not useful for us.
-	if test -x python3-config; then
-		# python3-config exists, use it.
-		CPPFLAGS_PYTHON="$(python3-config --includes)"
-		LDFLAGS_PYTHON="$(python3-config --ldflags)"
-	else
-		# No python3-config found, so try hardcoded python3.2-config.
-		CPPFLAGS_PYTHON="$(python3.2-config --includes)"
-		LDFLAGS_PYTHON="$(python3.2-config --ldflags)"
-	fi
-	;;
 *mingw*)
 	# We currently hardcode the paths to the Python 3.2 default install
 	# location as there's no 'python-config' script on Windows, it seems.
+	AC_MSG_WARN([using hardcoded Python3 configuration on MinGW])
 	CPPFLAGS_PYTHON="-I/c/Python32/include"
 	LDFLAGS_PYTHON="-L/c/Python32/libs -lpython32"
 	;;
 *)
-	# Everything else is untested, we just hope 'python3-config' works.
-	CPPFLAGS_PYTHON="$(python3-config --includes)"
-	LDFLAGS_PYTHON="$(python3-config --ldflags)"
+	# We know that Linux has 'python3-config'.
+	# On Darwin, Macports has python3.x-config, fink has python3-config.
+	# Mac OS X (Snow Leopard) ships with 'python-config' per default, but
+	# that's Python 2.x, so not useful for us.
+	# Everything else is untested, we just hope 'PYTHON3_CONFIG' works.
+	if test -n "$PYTHON3_CONFIG"; then
+		CPPFLAGS_PYTHON="$($PYTHON3_CONFIG --includes)"
+		LDFLAGS_PYTHON="$($PYTHON3_CONFIG --ldflags)"
+	else
+		AC_MSG_ERROR([python3-config not found])
+	fi
 	;;
 esac
 AC_SUBST(CPPFLAGS_PYTHON)
@@ -115,7 +113,7 @@ AC_SUBST(LDFLAGS_PYTHON)
 
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
-AC_CHECK_HEADERS([fcntl.h sys/time.h termios.h])
+# AC_CHECK_HEADERS([])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -130,7 +128,7 @@ AC_TYPE_UINT64_T
 AC_TYPE_SIZE_T
 
 # Checks for library functions.
-AC_CHECK_FUNCS([gettimeofday memset strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull])
+AC_CHECK_FUNCS([memset strtoull])
 
 AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders")
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
@@ -146,18 +144,24 @@ AC_SUBST(LIBSIGROKDECODE_MINOR_VERSION)
 AC_SUBST(LIBSIGROKDECODE_MICRO_VERSION)
 AC_SUBST(LIBSIGROKDECODE_VERSION)
 
-AC_DEFINE(LIBSIGROKDECODE_MAJOR_VERSION, [libsigrokdecode_major_version],
-	  [Define to the libsigrokdecode major package version])
-AC_DEFINE(LIBSIGROKDECODE_MINOR_VERSION, [libsigrokdecode_minor_version],
-	  [Define to the libsigrokdecode minor package version])
-AC_DEFINE(LIBSIGROKDECODE_MICRO_VERSION, [libsigrokdecode_micro_version],
-	  [Define to the libsigrokdecode micro package version])
-AC_DEFINE(LIBSIGROKDECODE_VERSION, [libsigrokdecode_version],
-	  [Define to the libsigrokdecode package version])
-
 AC_CONFIG_FILES([Makefile
+		 sigrokdecode.h
 		 libsigrokdecode.pc
 		 decoders/Makefile
+		 decoders/dcf77/Makefile
+		 decoders/edid/Makefile
+		 decoders/i2c/Makefile
+		 decoders/i2cdemux/Makefile
+		 decoders/i2cfilter/Makefile
+		 decoders/mlx90614/Makefile
+		 decoders/mx25lxx05d/Makefile
+		 decoders/nunchuk/Makefile
+		 decoders/pan1321/Makefile
+		 decoders/rtc8564/Makefile
+		 decoders/spi/Makefile
+		 decoders/transitioncounter/Makefile
+		 decoders/uart/Makefile
+		 decoders/usb/Makefile
 		])
 
 AC_OUTPUT