[Antiright-devel] antiright configure gtkshell/Makefile gtkshell/...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 08/10/26 00:02:38

Modified files:
        .              : configure 
        gtkshell       : Makefile add_options.c 
        libantiright   : tuple.c 

Log message:
        Fix broken builds.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/tuple.c?cvsroot=antiright&r1=1.3&r2=1.4

Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- configure   24 Oct 2008 06:06:18 -0000      1.116
+++ configure   26 Oct 2008 00:02:37 -0000      1.117
@@ -24,7 +24,7 @@
 #
 ###############################################################################
 
-VERSION=3.7
+VERSION=3.7a
 
 USE_DISTCC=NO
 USE_CCACHE=NO
@@ -135,25 +135,18 @@
 AS=as
 
 XSHELL_BUILD='cd xshell && $(MAKE)'
-if [ "$(uname | cut -d_ -f1)" = "MINGW32" ]; then
-       echo WIN32
-       WINDOWS="TRUE"
+OSNAME="$(uname | cut -d_ -f1)"
+#if [ "$OSNAME" = "MINGW32" ] || [ "$OSNAME" = "CYGWIN" ]; then
+echo $OSNAME
+if [ "$OSNAME" = "CYGWIN" ]; then
+       DEFS="$DEFS -DCYGWIN"
+elif [ "$OSNAME" = "MINGW32" ]; then
+       MINGW="TRUE"
        DEFS="$DEFS -DWIN32"
-<<<<<<< configure
-       CFLAGS="$CFLAGS -mms-bitfields -mno-cygwin"
+       CFLAGS="$CFLAGS -mms-bitfields"
        # CC=mingw32-gcc
        # AS=mingw32-as
        XSHELL_BUILD='echo xshell unsupported, not built'
-=======
-       CFLAGS="$CFLAGS -mms-bitfields -mno-cygwin"
-       # CC=mingw32-gcc
-       # AS=mingw32-as
-fi
-
-LEX="$(which flex)"
-if [ "$LEX" = "" ]; then
-       LEX=lex
->>>>>>> 1.115
 fi
 
 LEX="$(which flex)"
@@ -184,13 +177,9 @@
 echo "CFLAGS=$CFLAGS" >> config.mk
 echo "CC=$CC" >> config.mk
 echo "LDFLAGS=$LDFLAGS" >> config.mk
-<<<<<<< configure
 echo "LEX=$LEX" >> config.mk
 echo "YACC=$YACC" >> config.mk
 echo "XSHELL_BUILD=$XSHELL_BUILD" >> config.mk
-=======
-echo "LEX=$LEX" >> config.mk
->>>>>>> 1.115
 echo "AS=$AS" >> config.mk
 if [ "$WINDOWS" = "TRUE" ]; then
        SUFFIX='.exe'
@@ -199,7 +188,7 @@
 fi
 echo "SUFFIX=$SUFFIX" >> config.mk
 
-if [ "$WINDOWS" = "TRUE" ]; then
+if [ "$MINGW" = "TRUE" ]; then
        sed 's_C:/cygwin/_/_g' < config.mk > config.mk.new
        mv config.mk.new config.mk
        sed 's_
__g' < config.mk > config.mk.new

Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- gtkshell/Makefile   24 Oct 2008 06:06:18 -0000      1.56
+++ gtkshell/Makefile   26 Oct 2008 00:02:37 -0000      1.57
@@ -49,7 +49,7 @@
        cc -o gtkshell $(program) $(GTKFLAGS)
 
 lex.yy.c: guidl.lex
-       $(LEX) -v -l -nounistd -o lex.yy.c guidl.lex
+       $(LEX) -l -o lex.yy.c guidl.lex
 
 y.tab.h: lex.yy.c guidl.y
        $(YACC) -d -o y.tab.c guidl.y

Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- gtkshell/add_options.c      24 Oct 2008 06:06:18 -0000      1.57
+++ gtkshell/add_options.c      26 Oct 2008 00:02:37 -0000      1.58
@@ -173,9 +173,7 @@
                $(gsh, manage, terminal);
        }
 #else /* ! HAVE_VTE */
-#ifndef WIN32
-       add_command_cb(gsh, counter, argv);
-#endif
+       gsh_add_command_cb(gsh, counter, argv);
 #endif /* HAVE_VTE */
 }
 
@@ -207,9 +205,7 @@
 void
 gsh_add_embedded_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
-#ifndef WIN32
-       gsh_add_embedded(gsh, (char *)argv[++(*counter)]);
-#endif
+       gsh_swallow_app(gsh, (char *)argv[++(*counter)]);
 }
 
 

Index: libantiright/tuple.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/tuple.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libantiright/tuple.c        20 Dec 2007 00:21:12 -0000      1.3
+++ libantiright/tuple.c        26 Oct 2008 00:02:38 -0000      1.4
@@ -39,7 +39,9 @@
 void
 ar_delete_ARTupleVector(struct ARTupleVector * vector)
 {
+#if !defined(WIN32) & !defined(CYGWIN)
        g_hash_table_remove_all(vector->__hash);
+#endif
        g_hash_table_destroy(vector->__hash);
        g_free(vector);
 }