build: use lowercase for PKG_CHECK_MODULES

Otherwise, this is a bit ugly.

diff --git a/configure.ac b/configure.ac
index f198aa4d105ed2a60e5bcb26a8d33484cf61b623..97ae25582382b8e31bd3c8c08c5f495480e0094b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -222,7 +222,7 @@ m4_popdef([AC_LANG_CALL(C)])
 AC_CACHE_SAVE
 
 ## Unit tests wich check
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [have_check=yes], [have_check=no])
+PKG_CHECK_MODULES([check], [check >= 0.9.4], [have_check=yes], [have_check=no])
 
 # Third-party libraries
 lldp_CHECK_LIBEVENT

diff --git a/m4/libevent.m4 b/m4/libevent.m4
index 275e5a5682f113a18e384ef3aaa5b2979e29c5dd..bb3d53ed2388139193b3860c2148a739a2fa3d2b 100644 (file)
--- a/m4/libevent.m4
+++ b/m4/libevent.m4
@@ -13,13 +13,13 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [
      LIBEVENT_EMBEDDED=1
   else
     # If not forced, check first with pkg-config
-    PKG_CHECK_MODULES([LIBEVENT], [libevent >= 2.0.5], [
+    PKG_CHECK_MODULES([libevent], [libevent >= 2.0.5], [
        # Check if we have a working libevent
        AC_MSG_CHECKING([if system libevent works as expected])
        _save_CFLAGS="$CFLAGS"
        _save_LIBS="$LIBS"
-       CFLAGS="$CFLAGS $LIBEVENT_CFLAGS"
-       LIBS="$LIBS $LIBEVENT_LIBS"
+       CFLAGS="$CFLAGS $libevent_CFLAGS"
+       LIBS="$LIBS $libevent_LIBS"
        AC_TRY_LINK([
 @%:@include <sys/time.h>
 @%:@include <sys/types.h>
@@ -48,9 +48,9 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [
   fi
 
   if test x"$LIBEVENT_EMBEDDED" != x; then
-    unset LIBEVENT_LIBS
-    LIBEVENT_CFLAGS="-I\$(top_srcdir)/libevent/include -I\$(top_builddir)/libevent/include"
-    LIBEVENT_LDFLAGS="\$(top_builddir)/libevent/libevent.la"
+    unset libevent_LIBS
+    libevent_CFLAGS="-I\$(top_srcdir)/libevent/include -I\$(top_builddir)/libevent/include"
+    libevent_LDFLAGS="\$(top_builddir)/libevent/libevent.la"
   fi
 
   # Call ./configure in libevent. Need it for make dist...
@@ -66,7 +66,7 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [
   lldp_CONFIG_SUBDIRS([libevent], [$libevent_configure_args])
 
   AM_CONDITIONAL([LIBEVENT_EMBEDDED], [test x"$LIBEVENT_EMBEDDED" != x])
-  AC_SUBST([LIBEVENT_LIBS])
-  AC_SUBST([LIBEVENT_CFLAGS])
-  AC_SUBST([LIBEVENT_LDFLAGS])
+  AC_SUBST([libevent_LIBS])
+  AC_SUBST([libevent_CFLAGS])
+  AC_SUBST([libevent_LDFLAGS])
 ])

diff --git a/m4/seccomp.m4 b/m4/seccomp.m4
index b53249de2459b28287c58deeb5e501f36be0c4c4..e9134d52b4456f64742d2f4476147d2e3ce7fde4 100644 (file)
--- a/m4/seccomp.m4
+++ b/m4/seccomp.m4
@@ -4,9 +4,9 @@
 
 AC_DEFUN([lldp_CHECK_SECCOMP], [
    if test x"$with_seccomp" != x"no"; then
-      PKG_CHECK_MODULES([SECCOMP], [libseccomp >= 1], [
-         AC_SUBST([SECCOMP_LIBS])
-         AC_SUBST([SECCOMP_CFLAGS])
+      PKG_CHECK_MODULES([libseccomp], [libseccomp >= 1], [
+         AC_SUBST([libseccomp_LIBS])
+         AC_SUBST([libseccomp_CFLAGS])
          AC_DEFINE_UNQUOTED([USE_SECCOMP], 1, [Define to indicate to enable seccomp support])
          with_seccomp=yes
       ], [

diff --git a/m4/xml2.m4 b/m4/xml2.m4
index ecf99f513c86dd27506d33bdd23e934a17811f05..763755e149c7ce4f0d7e6bc8e410e25007be7f51 100644 (file)
--- a/m4/xml2.m4
+++ b/m4/xml2.m4
@@ -5,7 +5,7 @@
 
 AC_DEFUN([lldp_CHECK_XML2], [
   if test x"$with_xml" != x"no"; then
-   PKG_CHECK_MODULES([XML2], [libxml-2.0], [
+   PKG_CHECK_MODULES([libxml2], [libxml-2.0], [
     dnl Found through pkg-config
     AC_DEFINE_UNQUOTED([USE_XML], 1, [Define to indicate to enable XML support])
     with_xml=yes
@@ -20,13 +20,13 @@ AC_DEFUN([lldp_CHECK_XML2], [
       with_xml=no
     else
       dnl Check that it's working as expected
-      XML2_LIBS=`${XML2_CONFIG} --libs`
-      XML2_CFLAGS=`${XML2_CONFIG} --cflags`
+      libxml2_LIBS=`${XML2_CONFIG} --libs`
+      libxml2_CFLAGS=`${XML2_CONFIG} --cflags`
 
       _save_flags="$CFLAGS"
       _save_libs="$LIBS"
-      CFLAGS="$CFLAGS ${XML2_CFLAGS}"
-      LIBS="$LIBS ${XML2_LIBS}"
+      CFLAGS="$CFLAGS ${libxml2_CFLAGS}"
+      LIBS="$LIBS ${libxml2_LIBS}"
       AC_MSG_CHECKING([whether libxml-2 work as expected])
       AC_LINK_IFELSE([AC_LANG_PROGRAM([
 @%:@include <libxml/encoding.h>
@@ -37,8 +37,8 @@ AC_DEFUN([lldp_CHECK_XML2], [
         return (xw != NULL);
 ])],[
         AC_MSG_RESULT(yes)
-        AC_SUBST([XML2_LIBS])
-        AC_SUBST([XML2_CFLAGS])
+        AC_SUBST([libxml2_LIBS])
+        AC_SUBST([libxml2_CFLAGS])
         AC_DEFINE_UNQUOTED([USE_XML], 1, [Define to indicate to enable XML support])
         with_xml=yes
       ],[

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 3877f1c37b674c214e1b65f68586dd916fb52478..d1c168721ae29b6ce54ea94dd27f0268b6562aa7 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -28,8 +28,8 @@ lldpcli_LDFLAGS  = $(AM_LDFLAGS) $(LLDP_BIN_LDFLAGS)
 
 if USE_XML
 lldpcli_SOURCES += xml_writer.c
-lldpcli_CFLAGS  += @XML2_CFLAGS@
-lldpcli_LDADD   += @XML2_LIBS@
+lldpcli_CFLAGS  += @libxml2_CFLAGS@
+lldpcli_LDADD   += @libxml2_LIBS@
 endif
 
 # Completions

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 1e40bb1f2d9c2065ea44e04d69347fee8d508fc3..9c20e7fb8c927d7ce9f53c63a95ec3442ba0d0b3 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -28,16 +28,16 @@ liblldpd_la_SOURCES  = \
        protocols/sonmp.h \
        protocols/edp.c \
        protocols/edp.h
-liblldpd_la_CFLAGS   = $(AM_CFLAGS) @LIBEVENT_CFLAGS@
+liblldpd_la_CFLAGS   = $(AM_CFLAGS) @libevent_CFLAGS@
 liblldpd_la_CPPFLAGS = $(AM_CPPFLAGS) -DSYSCONFDIR='"$(sysconfdir)"' -DLLDPCLI_PATH='"$(sbindir)/lldpcli"'
 liblldpd_la_LIBADD   = \
        $(top_builddir)/src/libcommon-daemon-client.la \
-       $(top_builddir)/src/libcommon-daemon-lib.la @LIBEVENT_LIBS@
+       $(top_builddir)/src/libcommon-daemon-lib.la @libevent_LIBS@
 
 ## lldpd
 lldpd_SOURCES = main.c
 lldpd_LDFLAGS = $(AM_LDFLAGS) $(LLDP_BIN_LDFLAGS)
-lldpd_LDADD   = liblldpd.la @LIBEVENT_LDFLAGS@
+lldpd_LDADD   = liblldpd.la @libevent_LDFLAGS@
 
 if HOST_OS_LINUX
 liblldpd_la_SOURCES += \
@@ -112,8 +112,8 @@ syscall-names.h:
        echo "};" >> $@
 nodist_liblldpd_la_SOURCES += syscall-names.h
 liblldpd_la_SOURCES += priv-seccomp.c
-liblldpd_la_CFLAGS  += @SECCOMP_CFLAGS@
-liblldpd_la_LIBADD  += @SECCOMP_LIBS@
+liblldpd_la_CFLAGS  += @libseccomp_CFLAGS@
+liblldpd_la_LIBADD  += @libseccomp_LIBS@
 endif
 
 # Add SNMP support if needed

diff --git a/tests/Makefile.am b/tests/Makefile.am
index cd20adcc7853b0eef32aa4e801f8d75c29d84fdb..49fccd2a3492f8775571a3b07d02cfacecda3b9d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,8 +5,8 @@ AM_LDFLAGS = $(LLDP_LDFLAGS) $(LLDP_BIN_LDFLAGS)
 if HAVE_CHECK
 
 TESTS = check_marshal check_pattern check_lldp check_cdp check_sonmp check_edp check_fixedpoint
-AM_CFLAGS += @CHECK_CFLAGS@
-LDADD = $(top_builddir)/src/daemon/liblldpd.la @CHECK_LIBS@ @LIBEVENT_LDFLAGS@
+AM_CFLAGS += @check_CFLAGS@
+LDADD = $(top_builddir)/src/daemon/liblldpd.la @check_LIBS@ @libevent_LDFLAGS@
 
 check_marshal_SOURCES = check_marshal.c \
        $(top_srcdir)/src/marshal.h \