[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright configure ACE-desktop/system.antirigh...
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright configure ACE-desktop/system.antirigh... |
Date: |
Sat, 19 May 2007 03:29:10 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/05/19 03:29:09
Modified files:
. : configure
ACE-desktop : system.antiright
gtkshell : Makefile callbacks.c text.c
Log message:
Fix merge conflicts.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/system.antiright?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.30&r2=1.31
Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- configure 17 May 2007 16:09:54 -0000 1.95
+++ configure 19 May 2007 03:29:09 -0000 1.96
@@ -89,14 +89,15 @@
fi
fi
+
+echo "# Local Build Configuration" > config.mk
+
echo -n 'Checking for VTE... '
if pkg-config --exists vte; then
echo found
- DEFS="$DEFS -DHAVE_VTE"
- VTE=vte
+ echo 'VTE=1' >> config.mk
else
echo not found
- VTE=""
fi
INCLUDE="$INCLUDE -I/usr/pkg/include -I/usr/local/include -I/usr/X11R6/include"
@@ -107,7 +108,6 @@
INSTALL=/usr/bin/install
echo Prefix is $PREFIX
-echo "# Local Build Configuration" > config.mk
echo "VERSION=$VERSION" >> config.mk
echo "PREFIX=$PREFIX" >> config.mk
echo "INCLUDE=$INCLUDE" >> config.mk
Index: ACE-desktop/system.antiright
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/system.antiright,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ACE-desktop/system.antiright 23 Apr 2007 00:51:39 -0000 1.9
+++ ACE-desktop/system.antiright 19 May 2007 03:29:09 -0000 1.10
@@ -66,7 +66,7 @@
mp3_dir:~/archive/music
Manual_Root:echo /usr/share/man
Lock_Display:exec xlock -mode blank
-deskbar_style: echo 1
+deskbar_style: echo 3
deskbar_updater: echo TRUE
Sticky_Note: ACE -A Sticky_Note
Panel_Items: echo Lock_Display Screen Terminal File_Manager System_Monitor
Browser File_Sharing Text_Editor Word_Processor Image_Editor Calculator
Sticky_Note
Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gtkshell/Makefile 17 May 2007 16:11:44 -0000 1.29
+++ gtkshell/Makefile 19 May 2007 03:29:09 -0000 1.30
@@ -30,10 +30,14 @@
CFLAGS+=$(GTKFLAGS) $(DEFS)
LDFLAGS+=-L../libantiright -lantiright
LDFLAGS+=`pkg-config --libs gtk+-2.0`
-ifeq ($(VTE),vte)
- GTKFLAGS+=`pkg-config --cflags vte`
- LDFLAGS+=`pkg-config --libs vte`
-endif
+
+.if defined(VTE)
+CFLAGS+=-DHAVE_VTE
+GTKFLAGS+=`pkg-config --cflags vte`
+LDFLAGS+=`pkg-config --libs vte`
+.endif
+
+
#LDFLAGS+=-lefence
objects=y.tab.o lex.yy.o gtkshell.o arguments.o options.o callbacks.o\
Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gtkshell/callbacks.c 17 May 2007 16:17:29 -0000 1.28
+++ gtkshell/callbacks.c 19 May 2007 03:29:09 -0000 1.29
@@ -49,7 +49,7 @@
#ifdef HAVE_VTE
vte_terminal_feed_child(VTE_TERMINAL(terminal),
feed_command, strlen(feed_command));
-#endif HAVE_VTE
+#endif /* HAVE_VTE */
g_free(feed_command);
}
Index: gtkshell/text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gtkshell/text.c 17 May 2007 04:32:20 -0000 1.30
+++ gtkshell/text.c 19 May 2007 03:29:09 -0000 1.31
@@ -143,7 +143,7 @@
CHECK_GEOMETRY(gsh);
}
-/* Test for a text editor widget. */
+/* Check that the editor widget has been initialized. */
#define TEST_EDITOR_EXISTS(gsh)\
if(!gsh->editor.widget)\
return;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright configure ACE-desktop/system.antirigh...,
Jeffrey Bedard <=