From 89b7d2a4465628b128b8f5f7fde5f2a3e2b2a8df Mon Sep 17 00:00:00 2001 From: Steve Price Date: Fri, 7 Jul 2000 19:59:26 +0000 Subject: - Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config - Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly PR: 19623 Submitted by: KATO Tsuguru --- net-im/gicq/Makefile | 2 ++ net-im/gicq/files/patch-ab | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'net-im/gicq') diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile index 5e1ee2216e59..e51496425fda 100644 --- a/net-im/gicq/Makefile +++ b/net-im/gicq/Makefile @@ -17,12 +17,14 @@ MAINTAINER= flathill@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ icq.0:${PORTSDIR}/net/libicq +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --disable-nls CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GLIB_CONFIG="${GLIB_CONFIG}" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/net-im/gicq/files/patch-ab b/net-im/gicq/files/patch-ab index cc30b78ef453..504578e8dcdb 100644 --- a/net-im/gicq/files/patch-ab +++ b/net-im/gicq/files/patch-ab @@ -5,7 +5,7 @@ else ac_save_LIBS="$LIBS" -LIBS="-licq "`glib-config --libs`" $LIBS" -+LIBS="-licq "`glib12-config --libs`" $LIBS" ++LIBS="-licq "`$GLIB_CONFIG --libs`" $LIBS" cat > conftest.$ac_ext <