[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright configure gtkshell/Makefile
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright configure gtkshell/Makefile |
Date: |
Thu, 17 May 2007 16:09:54 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/05/17 16:09:54
Modified files:
. : configure
gtkshell : Makefile
Log message:
Added conditionals for VTE tests to build system.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.27&r2=1.28
Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- configure 17 May 2007 16:04:35 -0000 1.94
+++ configure 17 May 2007 16:09:54 -0000 1.95
@@ -93,8 +93,10 @@
if pkg-config --exists vte; then
echo found
DEFS="$DEFS -DHAVE_VTE"
+ VTE=vte
else
echo not found
+ VTE=""
fi
INCLUDE="$INCLUDE -I/usr/pkg/include -I/usr/local/include -I/usr/X11R6/include"
@@ -115,4 +117,5 @@
echo "INSTALL=$INSTALL" >> config.mk
echo "CFLAGS=$CFLAGS" >> config.mk
echo "CC=$CC" >> config.mk
+echo "VTE=$VTE" >> config.mk
Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gtkshell/Makefile 16 May 2007 20:39:44 -0000 1.27
+++ gtkshell/Makefile 17 May 2007 16:09:54 -0000 1.28
@@ -29,7 +29,10 @@
GTKFLAGS=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags vte`
CFLAGS+=$(GTKFLAGS) $(DEFS)
LDFLAGS+=-L../libantiright -lantiright
-LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs vte`
+LDFLAGS+=`pkg-config --libs gtk+-2.0`
+ifeq ($(VTE),vte)
+ LDFLAGS+=`pkg-config --libs vte`
+endif
#LDFLAGS+=-lefence
objects=y.tab.o lex.yy.o gtkshell.o arguments.o options.o callbacks.o\
- [Antiright-devel] antiright configure gtkshell/Makefile,
Jeffrey Bedard <=