autotools: Don't set/override "user variables".

[libserialport.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5818778912c6e033fb8aa039b353f85db08983d0..e569ee07f2dd296d8b4aa147929e8055f31efe15 100644 (file)
--- 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],
@@ -42,9 +42,6 @@ AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news])
 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 -Wmissing-prototypes -Wshadow"
-
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
@@ -75,10 +72,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
@@ -93,7 +86,6 @@ case $host_os in
        AM_CONDITIONAL([WIN32], false)
        AM_CONDITIONAL([MACOSX], true)
        AM_CONDITIONAL([FREEBSD], false)
-       LDFLAGS="$LDFLAGS -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation"
        AC_CHECK_HEADER(IOKit/IOKitLib.h, [], [AC_MSG_ERROR([IOKit/IOKitLib.h not found])])
        ;;
 mingw* | cygwin*)
@@ -101,7 +93,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)
@@ -118,7 +110,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.
@@ -169,12 +160,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,)]))