X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=aa55d436951e97c373ed073683fd7a418473e8e2;hb=35578b063e6899fad72f479d9004a54a66dd851a;hp=86d4eb60e414e7befc80ac35eaf533f466bd008d;hpb=7c081505e5ccdfc6178855d65499121ef1e58e53;p=libserialport.git diff --git a/configure.ac b/configure.ac index 86d4eb6..aa55d43 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,7 +33,9 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([autostuff]) AC_CONFIG_AUX_DIR([autostuff]) -AC_CANONICAL_TARGET +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]) @@ -41,7 +43,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # Enable more compiler warnings. -CFLAGS="$CFLAGS -std=c99 -Wall -Wextra -pedantic" +CFLAGS="$CFLAGS -std=c99 -Wall -Wextra -pedantic -Wmissing-prototypes -Wshadow" # Checks for programs. AC_PROG_CC @@ -79,7 +81,7 @@ AC_SUBST(SP_LIB_LDFLAGS) SP_PKGLIBS="" SP_LIBS="" -case $target_os in +case $host_os in *linux*) AM_CONDITIONAL([LINUX], true) AM_CONDITIONAL([WIN32], false) @@ -99,7 +101,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) @@ -167,12 +169,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,)]))