From 39a7795b3cef4d95d6948f8d8159e5ac405174b5 Mon Sep 17 00:00:00 2001 From: Frank Benkstein Date: Fri, 26 Dec 2008 22:18:55 +0100 Subject: [PATCH] configure: add glib linker and compiler flags --- configure | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/configure b/configure index d5d84d6..4fa3e57 100755 --- a/configure +++ b/configure @@ -90,9 +90,9 @@ enable_feature() { ;; debug) if [ "$2" = "yes" ] ; then - CFLAGS="${DEBUG_CFLAGS}" + CFLAGS="${DEBUG_CFLAGS} ${GLIB_CFLAGS}" else - CFLAGS="${DEFAULT_CFLAGS}" + CFLAGS="${DEFAULT_CFLAGS} ${GLIB_CFLAGS}" fi ;; *) @@ -219,12 +219,17 @@ set_defaults() { SCRIPTDIR="\$(LIBDIR)/vlock/scripts" MODULEDIR="\$(LIBDIR)/vlock/modules" + # glib + GLIB_CFLAGS="$(pkg-config --cflags glib-2.0)" + GLIB_LIBS="$(pkg-config --libs glib-2.0)" + CC=gcc DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99" DEBUG_CFLAGS="-O0 -g -Wall -W -pedantic -std=gnu99" - CFLAGS="${DEFAULT_CFLAGS}" + CFLAGS="${DEFAULT_CFLAGS} ${GLIB_CFLAGS}" LD=ld LDFLAGS="" + LDLIBS="${GLIB_LIBS}" AUTH_METHOD="pam" ENABLE_ROOT_PASSWORD="yes" ENABLE_PLUGINS="yes" @@ -325,7 +330,8 @@ build configuration: gnu make: $MAKE c compiler: $CC compiler flags: $CFLAGS - linker flags $LDFLAGS + libraries: $LDLIBS + linker flags: $LDFLAGS pam libs: $PAM_LIBS dl libs: $DL_LIB crypt lib: $CRYPT_LIB @@ -393,6 +399,8 @@ INSTALL = install # C compiler flags CFLAGS = ${CFLAGS} +# libraries +LDLIBS = ${LDLIBS} # linker flags LDFLAGS = ${LDFLAGS} # linker flags needed for dlopen and friends -- 2.11.4.GIT