Explorar o código

build: Replace -lknet with autoconf generated vars

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
Jan Friesse %!s(int64=8) %!d(string=hai) anos
pai
achega
1fba1b83aa
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 1 1
      configure.ac
  2. 2 2
      exec/Makefile.am

+ 1 - 1
configure.ac

@@ -167,7 +167,7 @@ CPPFLAGS="$SAVE_CPPFLAGS"
 LIBS="$SAVE_LIBS"
 LIBS="$SAVE_LIBS"
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([socket], [socket])
 AC_CHECK_LIB([socket], [socket])
-PKG_CHECK_MODULES([KNET],[libknet])
+PKG_CHECK_MODULES([knet],[libknet])
 AC_CHECK_LIB([nsl], [t_open])
 AC_CHECK_LIB([nsl], [t_open])
 AC_CHECK_LIB([rt], [sched_getscheduler])
 AC_CHECK_LIB([rt], [sched_getscheduler])
 AC_CHECK_LIB([z], [crc32],
 AC_CHECK_LIB([z], [crc32],

+ 2 - 2
exec/Makefile.am

@@ -45,9 +45,9 @@ TOTEM_SRC		= totemip.c totemnet.c totemudp.c \
 
 
 lib_LTLIBRARIES		= libtotem_pg.la
 lib_LTLIBRARIES		= libtotem_pg.la
 libtotem_pg_la_SOURCES	= $(TOTEM_SRC)
 libtotem_pg_la_SOURCES	= $(TOTEM_SRC)
-libtotem_pg_la_CFLAGS	= $(nss_CFLAGS)
+libtotem_pg_la_CFLAGS	= $(nss_CFLAGS) $(knet_CFLAGS)
 libtotem_pg_la_LDFLAGS	= -version-number $(subst .,:,$(SONAME))
 libtotem_pg_la_LDFLAGS	= -version-number $(subst .,:,$(SONAME))
-libtotem_pg_la_LIBADD	= -lpthread $(LIBQB_LIBS) $(nss_LIBS) -lknet
+libtotem_pg_la_LIBADD	= -lpthread $(LIBQB_LIBS) $(nss_LIBS) $(knet_LIBS)
 
 
 sbin_PROGRAMS		= corosync
 sbin_PROGRAMS		= corosync