diff --git a/configure.ac b/configure.ac
index 8e32d1626c..6235abffb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,10 +143,10 @@ AC_SUBST([libnetloc_so_version])
 
 AC_ARG_ENABLE([netloc],
               [AC_HELP_STRING([--enable-netloc],
-                              [The Netloc functionality is enabled by default, but will be silently skipped it if cannot be built (e.g., not supported on your platform).  Using --enable-netloc will cause configure to abort if Netloc cannot be build.  Using --disable-netloc will cause configure to skip attempting to build netloc at all.])
+                              [The Netloc functionality is disabled by default. Using --enable-netloc will cause configure to abort if Netloc cannot be build (e.g., not supported on your platform).])
               ])
 
-AS_IF([test "$enable_netloc" != "no" -a "$hwloc_mode" = "standalone"],
+AS_IF([test "$enable_netloc" = "yes" -a "$hwloc_mode" = "standalone"],
       [NETLOC_SETUP_CORE([], [],
            [AS_IF([test "$enable_netloc" = "yes"],
                   [AC_MSG_ERROR([Cannot build netloc core])])
diff --git a/contrib/ci.inria.fr/job-3-sonarscanner.sh b/contrib/ci.inria.fr/job-3-sonarscanner.sh
index 9996549b42..ce20c551a5 100755
--- a/contrib/ci.inria.fr/job-3-sonarscanner.sh
+++ b/contrib/ci.inria.fr/job-3-sonarscanner.sh
@@ -77,7 +77,7 @@ scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make |
 scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make check | tee -a scan-build.log
 
 # Run cppcheck analysis
-SOURCES_TO_ANALYZE="hwloc netloc tests utils"
+SOURCES_TO_ANALYZE="hwloc tests utils"
 SOURCES_TO_EXCLUDE="-itests/hwloc/ports -ihwloc/topology-aix.c -ihwloc/topology-bgq.c -ihwloc/topology-darwin.c -ihwloc/topology-freebsd.c -ihwloc/topology-hpux.c -ihwloc/topology-netbsd.c -ihwloc/topology-solaris.c -ihwloc/topology-solaris-chiptype.c -ihwloc/topology-windows.c -ihwloc/topology-cuda.c -ihwloc/topology-gl.c -ihwloc/topology-nvml.c -ihwloc/topology-opencl.c -iutils/lstopo/lstopo-windows.c"
 CPPCHECK_INCLUDES="-Iinclude -Ihwloc -Iutils/lstopo -Iutils/hwloc"
 CPPCHECK="cppcheck -v -f --language=c --platform=unix64 --enable=all --xml --xml-version=2 --suppress=purgedConfiguration --suppress=missingIncludeSystem ${CPPCHECK_INCLUDES}"
@@ -149,7 +149,7 @@ sonar.scm.disabled=false
 # sonar.scm.provider=git requires sonar-scanner to run inside a git clone
 sonar.sourceEncoding=UTF-8
 sonar.language=c
-sonar.sources=hwloc, netloc, tests, utils
+sonar.sources=hwloc, tests, utils
 sonar.exclusions=tests/hwloc/ports
 sonar.c.clangsa.reportPath=analyzer_reports/*/*.plist
 sonar.c.errorRecoveryEnabled=true