Menu
▾
▴
[Ganc-commit] ganc config.h.in,1.4,1.5 configure.in,1.16,1.17 ganc.glade2,1.1.1.1,1.2
|
From: <ho...@us...> - 2004-01-20 01:33:43
|
Update of /cvsroot/ganc/ganc
In directory sc8-pr-cvs1:/tmp/cvs-serv28642
Modified Files:
config.h.in configure.in ganc.glade2
Log Message:
Changed maaaaaaaaaaany things:
- Eliminated dependency on libzvt and readline, now the whole thing is
pure gtk (using GtkTextView for the display) and it looks nice
- Thus, now there's no 'forking' around and no pipes
- Major rearrangement of files (yes again!)
Added: display.c history.c variables.c defines.h parser.h
Removed: reader_communication.c reader_stuff.c terminal_stuff.c
evaluate_stuff.h mytypes.h pipe_stuff.h
- Now, and so far, is not possible to compile text only version
Index: config.h.in
===================================================================
RCS file: /cvsroot/ganc/ganc/config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** config.h.in 7 Dec 2003 21:52:22 -0000 1.4
--- config.h.in 20 Jan 2004 01:33:40 -0000 1.5
***************
*** 7,13 ****
#undef HAVE_LIBM
- /* Define to 1 if you have the `readline' library (-lreadline). */
- #undef HAVE_LIBREADLINE
-
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
--- 7,10 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/ganc/ganc/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** configure.in 14 Dec 2003 00:26:55 -0000 1.16
--- configure.in 20 Jan 2004 01:33:40 -0000 1.17
***************
*** 5,9 ****
AC_INIT(src/main.c)
AM_CONFIG_HEADER(config.h)
! AM_INIT_AUTOMAKE([ganc], [env])
dnl ***** Do --enable --disable checks ******
--- 5,9 ----
AC_INIT(src/main.c)
AM_CONFIG_HEADER(config.h)
! AM_INIT_AUTOMAKE([ganc], [cvs])
dnl ***** Do --enable --disable checks ******
***************
*** 13,17 ****
dnl Check if GUI has been disabled by user (enabled by default)
AC_ARG_ENABLE([gui], AC_HELP_STRING([--disable-gui], [disable GUI (GUI is enabled by default)]),
! [BUILD_GUI=$enableval], [BUILD_GUI=yes])
dnl C stuff
--- 13,18 ----
dnl Check if GUI has been disabled by user (enabled by default)
AC_ARG_ENABLE([gui], AC_HELP_STRING([--disable-gui], [disable GUI (GUI is enabled by default)]),
! [BUILD_GUI=$enableval], [BUILD_GUI=yes])
! BUILD_GUI=yes
dnl C stuff
***************
*** 28,33 ****
CFLAGS="-Wall $CFLAGS"
! dnl Check headers
!
dnl bison stuff
--- 29,34 ----
CFLAGS="-Wall $CFLAGS"
! dnl When working with CVS version make all warnings errors and enable debug
! test "$VERSION" == "cvs" && CFLAGS="-Werror -g $CFLAGS" && COMPILE_DEBUG="yes"
dnl bison stuff
***************
*** 36,57 ****
YACC="$YACC -d -v"
- dnl check readline
- AC_CHECK_LIB([readline], [readline], , readline_found=no)
-
- dnl give a second chance to readline
- if test "$readline_found" = "no" ; then
- readline_found=yes
- AC_CHECK_LIB(termcap, tgetent, readline_lib=-ltermcap,
- [AC_CHECK_LIB(curses, tgetent, readline_lib=-lcurses,
- [AC_CHECK_LIB(ncurses, tgetent, readline_lib=-lncurses,
- readline_lib="")])])
-
- AC_CHECK_LIB([readline], [rl_getc], [], readline_found=no, $readline_lib)
- LIBS="$LIBS $readline_lib"
- fi
-
- dnl if readline not found yet, stop
- test "$readline_found" = "no" && AC_MSG_ERROR(GNU readline library not found)
-
dnl check for pkg-config
AC_CHECK_PROG(PKGCONFIG, pkg-config, yes, no)
--- 37,40 ----
***************
*** 60,64 ****
dnl Only check gnome stuff if GUI is enabled
if test "$BUILD_GUI" = "yes"; then
! pkg_modules="libgnomeui-2.0 libzvt-2.0"
dnl pkg_modules="libgnomeui-2.0 vte"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules], [BUILD_GUI=yes], [BUILD_GUI=no])
--- 43,47 ----
dnl Only check gnome stuff if GUI is enabled
if test "$BUILD_GUI" = "yes"; then
! pkg_modules="libgnomeui-2.0"
dnl pkg_modules="libgnomeui-2.0 vte"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules], [BUILD_GUI=yes], [BUILD_GUI=no])
Index: ganc.glade2
===================================================================
RCS file: /cvsroot/ganc/ganc/ganc.glade2,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ganc.glade2 20 Nov 2003 03:31:39 -0000 1.1.1.1
--- ganc.glade2 20 Jan 2004 01:33:40 -0000 1.2
***************
*** 101,115 ****
<child>
! <widget class="Custom" id="display">
<property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="can_focus">True</property>
! <property name="creation_function">create_display</property>
! <property name="string1"></property>
! <property name="int1">40</property>
! <property name="int2">20</property>
! <property name="last_modification_time">Mon, 20 Oct 2003 18:49:12 GMT</property>
! <signal name="key_press_event" handler="on_display_key_press_event" last_modification_time="Mon, 20 Oct 2003 18:49:26 GMT"/>
</widget>
<packing>
--- 101,129 ----
<child>
! <widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
! <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
! <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! <property name="shadow_type">GTK_SHADOW_NONE</property>
! <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
!
! <child>
! <widget class="GtkTextView" id="textview1">
! <property name="visible">True</property>
! <property name="can_focus">True</property>
! <property name="editable">True</property>
! <property name="justification">GTK_JUSTIFY_LEFT</property>
! <property name="wrap_mode">GTK_WRAP_NONE</property>
! <property name="cursor_visible">True</property>
! <property name="pixels_above_lines">0</property>
! <property name="pixels_below_lines">0</property>
! <property name="pixels_inside_wrap">0</property>
! <property name="left_margin">0</property>
! <property name="right_margin">0</property>
! <property name="indent">0</property>
! <property name="text" translatable="yes"></property>
! </widget>
! </child>
</widget>
<packing>
|
