From 580115fc88eae124b307705fda885c999a4f4f08 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Mon, 9 Mar 2015 20:31:21 -0400 Subject: [PATCH] Start depending on glib We need glib for ISO 8601 time functions and plan to use it for more. --- Makefile.am | 10 +++++----- configure.ac | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 371e57f..5f4e2e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) bin_PROGRAMS= tr/trust_router tid/example/tidc tid/example/tids common/dh_test/tr_dh_test -AM_CPPFLAGS=-I$(srcdir)/include -AM_CFLAGS = -Wall -Werror=missing-prototypes -Werror -Wno-parentheses +AM_CPPFLAGS=-I$(srcdir)/include $(GLIB_CFLAGS) +AM_CFLAGS = -Wall -Werror=missing-prototypes -Werror -Wno-parentheses $(GLIB_CFLAGS) SUBDIRS = gsscon common_srcs = common/tr_name.c \ common/tr_constraint.c \ @@ -28,11 +28,11 @@ common/tr_filter.c \ common/tr_rp.c \ tr/tr.c -tr_trust_router_LDADD = gsscon/libgsscon.la libtr_tid.la +tr_trust_router_LDADD = gsscon/libgsscon.la libtr_tid.la $(GLIB_LIBS) tid_example_tidc_SOURCES = tid/example/tidc_main.c -tid_example_tidc_LDADD = gsscon/libgsscon.la libtr_tid.la +tid_example_tidc_LDADD = gsscon/libgsscon.la libtr_tid.la $(GLIB_LIBS) tid_example_tids_SOURCES = tid/example/tids_main.c @@ -45,7 +45,7 @@ libtr_tid_la_SOURCES = tid/tids.c tid/tidc.c tid/tid_req.c tid/tid_resp.c \ $(common_srcs) libtr_tid_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden -libtr_tid_la_LIBADD = gsscon/libgsscon.la +libtr_tid_la_LIBADD = gsscon/libgsscon.la $(GLIB_LIBS) libtr_tid_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2 -no-undefined pkginclude_HEADERS = include/trust_router/tid.h include/trust_router/tr_name.h \ diff --git a/configure.ac b/configure.ac index 7b3d658..6e15363 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,7 @@ AC_PROG_CC AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) fi AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) +PKG_CHECK_MODULES([GLIB], [glib-2.0]) AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context]) AC_CHECK_LIB([com_err], [error_message]) -- 2.1.4