X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=0662eb66d973ce9bbdce3c8e57f4a4251b28030d;hb=f14809393ace8e5f9a664975f34b701d1e35d2fa;hp=b8589d05fd6404860e72921f920acfd2e6ec5f77;hpb=613c48f19198f53a8241114d89958c720fbc924a;p=libserialport.git

diff --git a/configure.ac b/configure.ac
index b8589d0..0662eb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,8 @@ AC_PREREQ([2.63])
 
 # libserialport package version number (NOT the same as shared lib version!).
 m4_define([sp_package_version_major], [0])
-m4_define([sp_package_version_minor], [2])
-m4_define([sp_package_version_micro], [0])
+m4_define([sp_package_version_minor], [1])
+m4_define([sp_package_version_micro], [1])
 m4_define([sp_package_version], [sp_package_version_major.sp_package_version_minor.sp_package_version_micro])
 
 AC_INIT([libserialport], [sp_package_version], [martin-libserialport@earth.li],
@@ -33,6 +33,10 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
+AH_TOP([#ifndef SP_CONFIG_H
+#define SP_CONFIG_H])
+AH_BOTTOM([#endif])
+
 # We require at least automake 1.11 (needed for 'silent rules').
 AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -71,10 +75,6 @@ AC_SUBST(SP_LIB_LDFLAGS)
 
 # 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=""
 SP_LIBS=""
 
 case $host_os in
@@ -97,7 +97,7 @@ mingw* | cygwin*)
 	AM_CONDITIONAL([WIN32], true)
 	AM_CONDITIONAL([MACOSX], false)
 	AM_CONDITIONAL([FREEBSD], false)
-	SP_LIBS="-lsetupapi -luuid"
+	SP_LIBS="-lsetupapi"
 	;;
 *freebsd*)
 	AM_CONDITIONAL([LINUX], false)
@@ -114,7 +114,6 @@ mingw* | cygwin*)
 	AC_DEFINE(NO_PORT_METADATA,,[Port metadata is unavailable])
 esac
 
-AC_SUBST(SP_PKGLIBS)
 AC_SUBST(SP_LIBS)
 
 # Define size_t if not defined as standard.
@@ -165,12 +164,12 @@ AC_DEFINE(SP_PRIV,,[Macro preceding private functions])
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 		__attribute__((visibility("hidden"))) void foo(void) { }
 	]])],
-	[AC_DEFINE(SP_API , __attribute__((visibility("default"))))]
+	[AC_DEFINE(SP_API, __attribute__((visibility("default"))))]
 	[AC_DEFINE(SP_PRIV, __attribute__((visibility("hidden"))))],
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 		__declspec(dllexport) void foo(void) { }
 	]])],
-	[AC_DEFINE(SP_API , __declspec(dllexport))]
+	[AC_DEFINE(SP_API, __declspec(dllexport))]
 	[AC_DEFINE(SP_PRIV,)],
 	[AC_DEFINE(SP_API,)]
 	[AC_DEFINE(SP_PRIV,)]))