X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=91174fc6a8fbde25ca686e33f0cf70b42fcf9f9d;hb=cf9d365ce06a033c5aca4641740ad347162026be;hp=31e54bb8cfa308e0d406d5eba81f14b78df411c1;hpb=1ebf4347e087d10ea7f9bd916c8bdc426ffd4b5e;p=libserialport.git

diff --git a/configure.ac b/configure.ac
index 31e54bb..91174fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ m4_define([sp_package_version_minor], [1])
 m4_define([sp_package_version], [sp_package_version_major.sp_package_version_minor])
 
 AC_INIT([libserialport], [sp_package_version], [martin-libserialport@earth.li],
-	[libserialport], [http://github.com/martinling/libserialport])
+	[libserialport], [http://sigrok.org/wiki/Libserialport])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
@@ -58,6 +58,7 @@ AM_PROG_CC_C_O
 LT_INIT
 
 # Initialize pkg-config.
+# We require at least 0.22, as "Requires.private" behaviour changed there.
 PKG_PROG_PKG_CONFIG([0.22])
 
 # Library version for libserialport (NOT the same as the package version).
@@ -75,15 +76,19 @@ AC_SUBST(SP_LIB_VERSION_AGE)
 AC_SUBST(SP_LIB_VERSION)
 AC_SUBST(SP_LIB_LDFLAGS)
 
-# Checks for header files.
-# These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
-AC_CHECK_HEADERS([sys/types.h sys/stat.h fcntl.h termios.h sys/ioctl.h errno.h])
+# Checks for libraries.
+
+# This variable collects the pkg-config names of all detected libs.
+# It is then used to construct the "Requires.private:" field in the
+# libserialport.pc file.
+SP_PKGLIBS=""
 
 case $target_os in
 *linux*)
+	# On Linux libudev is currently a hard requirement.
 	PKG_CHECK_MODULES([libudev], [libudev >= 0],
-		[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS"],
-		[AC_MSG_ERROR([libudev.h not found])])
+		[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
+		SP_PKGLIBS="$SP_PKGLIBS libudev"])
 	;;
 *darwin*)
 	LDFLAGS="$LDFLAGS -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation"
@@ -91,6 +96,13 @@ case $target_os in
 	;;
 esac
 
+AC_SUBST(SP_PKGLIBS)
+
+# Checks for header files.
+# These are already checked: inttypes.h dlfcn.h memory.h stdint.h stdlib.h
+# string.h strings.h sys/types.h sys/stat.h unistd.h
+AC_CHECK_HEADERS([errno.h fcntl.h stddef.h sys/ioctl.h termios.h])
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 AC_TYPE_SIZE_T
@@ -110,14 +122,14 @@ AC_SUBST(SP_PACKAGE_VERSION_MAJOR)
 AC_SUBST(SP_PACKAGE_VERSION_MINOR)
 AC_SUBST(SP_PACKAGE_VERSION)
 
-AC_CONFIG_FILES([Makefile libserialport.pc])
+AC_CONFIG_FILES([Makefile libserialport.h libserialport.pc])
 
 AC_OUTPUT
 
 echo
 echo "libserialport configuration summary:"
 echo
-echo "  - Package version (major.minor):    $SP_PACKAGE_VERSION"
+echo "  - Package version (major.minor):          $SP_PACKAGE_VERSION"
 echo "  - Library version (current:revision:age): $SP_LIB_VERSION"
 echo "  - Prefix: $prefix"
 echo "  - Building on: $build"