[patch] Path for Glib2

pam-0.77-glib2.patch (text/plain), 1.56 KB, created by Kaiting Chen on 2004-11-17 18:05:00 UTC

--- Linux-PAM-0.77/modules/pam_console/Makefile	2004-11-17 20:39:49.974146897 -0500
+++ Linux-PAM-0.77/modules/pam_console/Makefile.new	2004-11-17 20:39:10.982074774 -0500
@@ -10,9 +10,7 @@
 
 LOCKDIR = /var/run/console
 LOCKMODE = 755
-# Use static version of glib
-GLIB = $(shell glib-config --libs | sed -e 's|^.*-L\([^[:space:]]*\)[[:space:]]*.*|\1/libglib.a|')
-LIBS +=  $(ROOT)$(GLIB) -L../pammodutil -lpammodutil
+LIBS += $(shell pkg-config --libs glib-2.0) -L../pammodutil -lpammodutil
 LDFLAGS = $(LIBS)
 
 BINARY = pam_console_apply
@@ -22,7 +20,7 @@
 MAN5 = console.apps.5 console.perms.5
 MAN8 = pam_console.8 pam_console_apply.8
 
-CFLAGS += $(shell glib-config --cflags) -D_GNU_SOURCE -DLOCKDIR=\"$(LOCKDIR)\" -I../pammodutil/include
+CFLAGS += $(shell pkg-config --cflags glib-2.0) -D_GNU_SOURCE -DLOCKDIR=\"$(LOCKDIR)\" -I../pammodutil/include
 
 FLEX_OPTS = -Cr
 BISON_OPTS = -d
@@ -64,7 +62,7 @@
 endif
 
 $(BINARY): $(BINSRC)
-	$(CC) $(CFLAGS) $(TARGET_ARCH) -o $@ $^ -Wl,-Bstatic $(LDFLAGS) -Wl,-Bdynamic ../../libpam/libpam.so -lc
+	$(CC) $(CFLAGS) $(TARGET_ARCH) -o $@ $^ -Wl,-Bdynamic $(LDFLAGS) ../../libpam/libpam.so -lc
 
 ifdef DYNAMIC
 $(LIBOBJD): $(LIBSRC)
@@ -75,7 +73,7 @@
 	$(LD_D) -o $@ $(LIBOBJD) $(LIBS) $(NEED_LINK_LIB_C)
 
 pam_console_apply_devfsd.so:	dynamic/pam_console_apply_devfsd.o
-	$(LD_D) -o $@ dynamic/pam_console_apply_devfsd.o -Wl,-Bstatic $(LIBS) -L../../libpam -lpam -Wl,-Bdynamic $(NEED_LINK_LIB_C)
+	$(LD_D) -o $@ dynamic/pam_console_apply_devfsd.o -Wl,-Bstatic -L../../libpam -lpam -Wl,-Bdynamic $(LIBS) $(NEED_LINK_LIB_C)
 endif
 
 ifdef STATIC