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

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 08/11/10 22:04:37

Modified files:
        .              : Makefile configure 
        gtkshell       : containers.c dialog.h gtkshell.h init.c 

Log message:
        Consolidated tests in build system.  Use OK button instead of Close 
button
        on dialogs.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/Makefile?cvsroot=antiright&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.c?cvsroot=antiright&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/init.c?cvsroot=antiright&r1=1.13&r2=1.14

Patches:
Index: Makefile
===================================================================
RCS file: /sources/antiright/antiright/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- Makefile    26 Oct 2008 21:12:38 -0000      1.26
+++ Makefile    10 Nov 2008 22:04:36 -0000      1.27
@@ -43,8 +43,10 @@
        cd gtkshell && $(MAKE) clean
        cd ACE-desktop && $(MAKE) clean
        $(XSHELL_BUILD) clean
-       #cd xshell && $(MAKE) clean
-#      cd rootcat && $(MAKE) clean
+ifneq ($(OS),MINGW32)
+       cd xshell && $(MAKE) clean
+       cd rootcat && $(MAKE) clean
+endif
 
 distclean: clean
        rm -rf config.mk tags */.\#* .\#* 
@@ -77,8 +79,10 @@
        cd gtkshell && $(MAKE) install
        cd ACE-desktop && $(MAKE) install
        $(XSHELL_BUILD) install
-#      cd xshell && $(MAKE) install
-#      cd rootcat && $(MAKE) install
+ifneq ($(OS),MINGW32)
+       cd xshell && $(MAKE) install
+       cd rootcat && $(MAKE) install
+endif
 
 bzball: distclean
        cd .. && cp -R antiright antiright-$(VERSION) \

Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- configure   26 Oct 2008 00:18:39 -0000      1.118
+++ configure   10 Nov 2008 22:04:36 -0000      1.119
@@ -32,6 +32,9 @@
 # Must be enabled.  
 USE_GTK=YES
 
+TRUE=0
+FALSE=1
+
 for ARG in $@; do
        if [ "$ARG" = "-d" ]; then
                echo 'Configuring with debug options...'
@@ -63,75 +66,92 @@
 fi
 DEFS="$DEFS -DPREFIX='\"$PREFIX\"'"
 
-if [ "$MAKE" = "" ]; then
-       MAKE="$(which make)"
-fi
-if [ "$MAKE" = "" ]; then
-       MAKE="$(which gmake)"
-fi
-if [ "$MAKE" = "" ]; then
-       echo Make not found in path, defaulting to /usr/bin/make.
-       MAKE=/usr/bin/make
-fi
-
-if [ "$CC" = "" ]; then
 
-       CC=cc
+check_component()
+{
+       local COMPONENT=$1
+       local CMP_DEF=""
+
+       CMP_DEF=$2
+       if [ "$CMP_DEF" = "" ]; then
+               CMP_DEF=$COMPONENT
+       fi
 
-       if [ "$USE_DISTCC" = "YES" ]; then
-               DISTCC="$(which distcc)"
-               if [ "$DISTCC" != "" ]; then
-                       CC=$DISTCC      
+       echo -n "Checking for $COMPONENT...  "
+       if pkg-config --exists $COMPONENT; then
+               echo found
+               DEFS="$DEFS -DHAVE_$CMP_DEF"
+               echo "$CMP_DEF=1" >> config.mk
+               INCLUDE="$INCLUDE $(pkg-config --cflags $COMPONENT)"
+               LDFLAGS="$LDFLAGS $(pkg-config --libs $COMPONENT)"
+       else
+               echo not found
                fi
+}
+
+check_path_for()
+{
+       local ITEM=$1
+       local ROOTPATHS="/ /usr/ /usr/local/ /usr/pkg/ /usr/X11R6/ /opt/"
+
+       echo -n "Checking for $ITEM...  "
+
+       for ROOTPATH in $ROOTPATHS; do
+               for SUBPATH in bin lib include; do
+#                      echo testing ${ROOTPATH}${SUBPATH}/$1
+                       if [ -f "${ROOTPATH}${SUBPATH}/$1" ]; then
+                               echo found
+                               return $TRUE
        fi
+               done
+       done
+       echo not found
+       return $FALSE
+}
 
-       if [ "$USE_CCACHE" = "YES" ]; then
-               CCACHE="$(which ccache)"
+echo "# Local Build Configuration" > config.mk
 
-               if [ "$CCACHE" != "" ]; then
-                       CC="$CCACHE $CC"                
-               fi
-       fi
+CC=cc
+if check_path_for gcc; then
+       CC=gcc
 fi
 
-echo "# Local Build Configuration" > config.mk
-if [ "$USE_GTK" = "YES" ]; then
-       LDFLAGS="$LDFLAGS $(pkg-config --libs gtk+-2.0)"
-       DEFS="$DEFS -DUSE_GTK"
-       INCLUDE="$INCLUDE $(pkg-config --cflags gtk+-2.0)"
+if check_path_for distcc; then
+       CC=distcc
+fi
        
-       echo -n 'Checking for VTE...  '
-       if pkg-config --exists vte; then
-               echo found
-               DEFS="$DEFS -DHAVE_VTE"
-               echo 'VTE=1' >> config.mk
-               INCLUDE="$INCLUDE $(pkg-config --cflags vte)"
-               # Do not include previous contents to ensure 
-               # proper library ordering. Because of this, 
-               #non-gtk specific libraries should follow.  
-               LDFLAGS="$(pkg-config --libs vte)"
-       else
-               echo not found
-       fi
-else # not USE_GTK
-       LDFLAGS="$LDFLAGS -L/usr/pkg/lib -L/usr/X11R6/lib -lX11"
-fi # USE_GTK
+if check_path_for ccache; then
+       CC="ccache $CC"
+fi
 
+MAKE=make
+if check_path_for gmake; then
+       MAKE=gmake
+fi
 
-if [ "$USE_BOEHMGC" = "YES" ]; then
-       echo -n 'Checking for Boehm-GC... '
-       if ( [ -f /usr/pkg/lib/libgc.a ]\
-               || [ -f /usr/lib/libgc.a ]\
-               || [ -f /usr/local/lib/libgc.a ]); then
-               echo found
+if check_path_for libgc.a || check_path_for libgc.so\
+       || check_path_for libgc.so.1; then
+       if check_path_for gc.h; then
                echo 'LIBGC=1' >> config.mk
                DEFS="$DEFS -DLIBGC"
                LDFLAGS="$LDFLAGS -lgc"
-       else
-               echo not found 
        fi
 fi
 
+LEX="$(which flex)"
+if [ "$LEX" = "" ]; then
+       LEX=lex
+fi
+YACC="$(which bison)"
+if [ "$YACC" = "" ]; then
+       YACC=yacc
+fi
+
+check_component "gtk+-2.0" "GTK"
+check_component "vte" "VTE"
+#check_component "libpanelapplet-2.0" "PANEL_APPLET"
+
+
 AS=as
 
 XSHELL_BUILD='cd xshell && $(MAKE)'
@@ -149,14 +169,6 @@
        XSHELL_BUILD='echo xshell unsupported, not built'
 fi
 
-LEX="$(which flex)"
-if [ "$LEX" = "" ]; then
-       LEX=lex
-fi
-YACC="$(which bison)"
-if [ "$YACC" = "" ]; then
-       YACC=yacc
-fi
 
 
 INCLUDE="$INCLUDE -I/usr/pkg/include -I/usr/local/include -I/usr/X11R6/include"

Index: gtkshell/containers.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gtkshell/containers.c       11 Jun 2007 21:32:39 -0000      1.23
+++ gtkshell/containers.c       10 Nov 2008 22:04:37 -0000      1.24
@@ -105,6 +105,11 @@
        else if (!GSH_FLAG(GSH_NO_BASE_FRAME))
                setup_framed(gsh);
        else
-               GSHCA(gsh->widgets.window, gsh->rows->h);
+       {
+               GtkWidget *window=gsh->widgets.window;
+               GtkWidget *row=gsh->rows->h;
+
+               GSHCA(window, row);
+       }
 }
 

Index: gtkshell/dialog.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/dialog.h   13 Aug 2007 07:12:31 -0000      1.1
+++ gtkshell/dialog.h   10 Nov 2008 22:04:37 -0000      1.2
@@ -40,7 +40,7 @@
 #define GSH_MESSAGE_DIALOG(gsh, type, text)\
        gsh_common_dialog_executioner(gsh, gtk_message_dialog_new(\
                GTK_WINDOW(gsh->widgets.window), 
GTK_DIALOG_DESTROY_WITH_PARENT,\
-               type, GTK_BUTTONS_CLOSE, (gchar *) text), NULL);
+               type, GTK_BUTTONS_OK, (gchar *) text), NULL);
 
 #define GSH_FONT_DIALOG(gsh)\
        gsh_common_dialog_executioner(gsh, gtk_font_selection_dialog_new(\

Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- gtkshell/gtkshell.h 10 Dec 2007 15:14:32 -0000      1.59
+++ gtkshell/gtkshell.h 10 Nov 2008 22:04:37 -0000      1.60
@@ -35,6 +35,10 @@
 #include <unistd.h>
 #include <signal.h>
 
+#ifdef HAVE_PANEL_APPLET
+#include <panel-applet.h>
+#endif /* HAVE_PANEL_APPLET */
+
 #include "../libantiright/library.h"
 
 #ifndef YYFILE

Index: gtkshell/init.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/init.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/init.c     11 Jun 2007 21:32:42 -0000      1.13
+++ gtkshell/init.c     10 Nov 2008 22:04:37 -0000      1.14
@@ -41,7 +41,8 @@
 {
        GtkWidget *window;
 
-       window = gsh->widgets.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       window = gsh->widgets.window = 
+               gtk_window_new(GTK_WINDOW_TOPLEVEL);
        setup_quit_signals(GTK_WINDOW(window));
 
        return window;