X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=8ac87a326a088af7aa9cbb9ca2540366f53d7341;hb=df3b70a88849a50aad823a7c0a96ae83eb474a32;hp=5c372dd45e47875574eccc851d56d58945db1f6a;hpb=07f61c713133654cab842107570d9e75c23c89c7;p=libserialport.git

diff --git a/configure.ac b/configure.ac
index 5c372dd..8ac87a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,16 +33,11 @@ AC_CONFIG_HEADERS([config.h libserialport.h])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
-AH_TOP([#ifndef SP_CONFIG_H
-#define SP_CONFIG_H])
-
 AH_BOTTOM([#if HAVE_STRUCT_TERMIOS_C_ISPEED && HAVE_STRUCT_TERMIOS_C_OSPEED
 # define HAVE_TERMIOS_SPEED 1
 #endif
 #if HAVE_STRUCT_TERMIOS2_C_ISPEED && HAVE_STRUCT_TERMIOS2_C_OSPEED
 # define HAVE_TERMIOS2_SPEED 1
-#endif
-
 #endif])
 
 # We require at least automake 1.11 (needed for 'silent rules').
@@ -68,9 +63,9 @@ AC_SUBST([SP_PACKAGE_VERSION], [sp_package_version])
 # Carefully read the libtool docs before updating these numbers!
 # The algorithm for determining which number to change (and how) is nontrivial!
 # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-SP_LIB_VERSION_CURRENT=0
+SP_LIB_VERSION_CURRENT=1
 SP_LIB_VERSION_REVISION=0
-SP_LIB_VERSION_AGE=0
+SP_LIB_VERSION_AGE=1
 AC_SUBST([SP_LIB_VERSION],
 	["$SP_LIB_VERSION_CURRENT:$SP_LIB_VERSION_REVISION:$SP_LIB_VERSION_AGE"])
 
@@ -79,7 +74,7 @@ AC_DEFINE_UNQUOTED([SP_LIB_VERSION_REVISION], [$SP_LIB_VERSION_REVISION], [.])
 AC_DEFINE_UNQUOTED([SP_LIB_VERSION_AGE], [$SP_LIB_VERSION_AGE], [.])
 AC_DEFINE_UNQUOTED([SP_LIB_VERSION_STRING], ["$SP_LIB_VERSION"], [.])
 
-AM_CONDITIONAL([LINUX], [test -z "${host_os##linux*}"])
+AM_CONDITIONAL([LINUX], [test -z "${host_os##linux*}" || test -z "${host_os##uclinux*}"])
 AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"])
 AM_CONDITIONAL([MACOSX], [test -z "${host_os##darwin*}"])
 AM_CONDITIONAL([FREEBSD], [test -z "${host_os##freebsd*}"])