gnupos-cvs Mailing List for GnuPOS (Page 2)
Status: Pre-Alpha
Brought to you by:
conrad_c
You can subscribe to this list here.
2003 |
Jan
(35) |
Feb
(14) |
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|
From: <con...@us...> - 2003-01-13 11:57:11
|
Update of /cvsroot/gnupos/quick-gui/src In directory sc8-pr-cvs1:/tmp/cvs-serv11679/src Modified Files: main.c q-gui-display.c q-gui.h Added Files: quick-gui.gspl Log Message: Make quick-gui compile, and adjustments for interface to gnupos. Added gspl interface file. --- NEW FILE: quick-gui.gspl --- <?xml version="1.0"?> <gnp:GnuPOS xmlns:gnp="http://www.gnucash.org/gnuPOS/Statefile/1.1"> <gnp:definitions> <gnp:library name="quick-gui"> <gnp:path>/home/conrad/gnuPOS/quick-gui/libquick_gui.so</gnp:path> <gnp:type>dynamic</gnp:type> <gnp:init-routine>qg_initialise</gnp:init-routine> <gnp:callback> <gnp:register>display</gnp:register> <gnp:function>qg_topbox_write_string</gnp:function> </gnp:callback> <gnp:callback> <gnp:register>helptext</gnp:register> <gnp:function>qg_leftbox_write_string</gnp:function> </gnp:callback> <gnp:callback> <gnp:register>logtext</gnp:register> <gnp:function>qg_rightbox_write_string</gnp:function> </gnp:callback> </gnp:library> </gnp:definitions> </gnp:GnuPOS> Index: main.c =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/main.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** main.c 9 Jan 2003 13:35:50 -0000 1.1.1.1 --- main.c 13 Jan 2003 11:57:08 -0000 1.2 *************** *** 1,7 **** - /* - * Initial main.c file generated by Glade. Edit as required. - * Glade will not overwrite this file. - */ - #ifdef HAVE_CONFIG_H # include <config.h> --- 1,2 ---- *************** *** 12,21 **** #include "interface.h" #include "support.h" int main (int argc, char *argv[]) { ! GtkWidget *quick_gui; #ifdef ENABLE_NLS bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR); --- 7,24 ---- #include "interface.h" #include "support.h" + #include "q-gui.h" + + qg_global_data_struct qg_global_data; + int qg_debug; int main (int argc, char *argv[]) { ! return 0; ! } + void + qg_initialise() + { #ifdef ENABLE_NLS bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR); *************** *** 23,38 **** #endif ! gnome_init ("quick-gui", VERSION, argc, argv); ! /* ! * The following code was added by Glade to create one of each component ! * (except popup menus), just so that you see something after building ! * the project. Delete any components that you don't want shown initially. ! */ ! quick_gui = create_GnuPOS_Quick_GUI (); ! gtk_widget_show (quick_gui); gtk_main (); - return 0; } --- 26,40 ---- #endif ! gnome_init ("quick-gui", VERSION, NULL, NULL); ! qg_global_data.GnuPOS = create_GnuPOS_Quick_GUI (); ! gtk_widget_show (qg_global_data.GnuPOS); ! qg_debug=1; ! } + void + qg_event_loop() + { gtk_main (); } Index: q-gui-display.c =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/q-gui-display.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** q-gui-display.c 12 Dec 2002 01:13:11 -0000 1.1.1.1 --- q-gui-display.c 13 Jan 2003 11:57:08 -0000 1.2 *************** *** 366,369 **** --- 366,382 ---- } + void qg_rightbox_write_string(gchar *x) + + /* wrapper that does an erase_all then a */ + /* write string of the passed string */ + + { + if(qg_debug) + printf("In qg_rightbox_write_string()\n"); + + qg_rightbox_erase_all(); + qg_rightbox_insert_string(x); + } + /* */ /* leftbox ROUTINES */ *************** *** 465,467 **** --- 478,493 ---- gtk_text_insert(qg_mainwindow_data.leftbox, qg_mainwindow_data.left.font, qg_mainwindow_data.left.fg, qg_mainwindow_data.left.bg, x, -1); + } + + void qg_leftbox_write_string(gchar *x) + + /* wrapper that does an erase_all then a */ + /* write string of the passed string */ + + { + if(qg_debug) + printf("In qg_leftbox_write_string()\n"); + + qg_leftbox_erase_all(); + qg_leftbox_insert_string(x); } Index: q-gui.h =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/q-gui.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** q-gui.h 9 Jan 2003 13:35:56 -0000 1.1.1.2 --- q-gui.h 13 Jan 2003 11:57:08 -0000 1.2 *************** *** 29,32 **** --- 29,33 ---- void qg_rightbox_insert_char(gchar); void qg_rightbox_insert_string(gchar *); + void qg_rightbox_write_string(gchar *); void qg_autohist_resize(void); void qg_rightbox_refont(void); *************** *** 36,39 **** --- 37,41 ---- void qg_leftbox_insert_char(gchar); void qg_leftbox_insert_string(gchar *); + void qg_leftbox_write_string(gchar *); void qg_leftbox_refont(void); |
From: <con...@us...> - 2003-01-13 11:57:11
|
Update of /cvsroot/gnupos/quick-gui/m4 In directory sc8-pr-cvs1:/tmp/cvs-serv11679/m4 Modified Files: Makefile.in Log Message: Make quick-gui compile, and adjustments for interface to gnupos. Added gspl interface file. Index: Makefile.in =================================================================== RCS file: /cvsroot/gnupos/quick-gui/m4/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 6 Jan 2003 06:07:43 -0000 1.1 --- Makefile.in 13 Jan 2003 11:57:08 -0000 1.2 *************** *** 58,62 **** --- 58,123 ---- PRE_UNINSTALL = : POST_UNINSTALL = : + host_alias = @host_alias@ + host_triplet = @host@ + AMTAR = @AMTAR@ + AWK = @AWK@ + BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ + CATOBJEXT = @CATOBJEXT@ CC = @CC@ + DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ + EXEEXT = @EXEEXT@ + GENCAT = @GENCAT@ + GLIBC21 = @GLIBC21@ + GMSGFMT = @GMSGFMT@ + GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ + GNOMEUI_LIBS = @GNOMEUI_LIBS@ + GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ + GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ + GNOME_CONFIG = @GNOME_CONFIG@ + GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@ + GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ + GNOME_LIBDIR = @GNOME_LIBDIR@ + GNOME_LIBS = @GNOME_LIBS@ + GNORBA_CFLAGS = @GNORBA_CFLAGS@ + GNORBA_LIBS = @GNORBA_LIBS@ + GTKXMHTML_LIBS = @GTKXMHTML_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_CONFIG = @GTK_CONFIG@ + GTK_LIBS = @GTK_LIBS@ + HAVE_LIB = @HAVE_LIB@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLBISON = @INTLBISON@ + INTLLIBS = @INTLLIBS@ + INTLOBJS = @INTLOBJS@ + INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ + LIB = @LIB@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ + LTLIB = @LTLIB@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ + MAKEINFO = @MAKEINFO@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + OBJEXT = @OBJEXT@ + ORBIT_CFLAGS = @ORBIT_CFLAGS@ + ORBIT_CONFIG = @ORBIT_CONFIG@ + ORBIT_IDL = @ORBIT_IDL@ + ORBIT_LIBS = @ORBIT_LIBS@ + PACKAGE = @PACKAGE@ + POSUB = @POSUB@ + PTHREAD_LIB = @PTHREAD_LIB@ + RANLIB = @RANLIB@ + USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + XPM_LIBS = @XPM_LIBS@ + ZVT_LIBS = @ZVT_LIBS@ + am__include = @am__include@ + am__quote = @am__quote@ + cflags_set = @cflags_set@ + cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 *************** *** 66,72 **** DIST_COMMON = ChangeLog Makefile.am Makefile.in - - PACKAGE = @PACKAGE@ - VERSION = @VERSION@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) --- 127,130 ---- |
From: <con...@us...> - 2003-01-13 11:57:11
|
Update of /cvsroot/gnupos/quick-gui In directory sc8-pr-cvs1:/tmp/cvs-serv11679 Modified Files: COPYING ChangeLog Makefile.am autogen.sh configure.in mkinstalldirs Log Message: Make quick-gui compile, and adjustments for interface to gnupos. Added gspl interface file. Index: COPYING =================================================================== RCS file: /cvsroot/gnupos/quick-gui/COPYING,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** COPYING 6 Jan 2003 06:04:54 -0000 1.1 --- COPYING 13 Jan 2003 11:57:07 -0000 1.2 *************** *** 3,7 **** Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. --- 3,7 ---- Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. *************** *** 292,296 **** <one line to give the program's name and a brief idea of what it does.> ! Copyright (C) 19yy <name of author> This program is free software; you can redistribute it and/or modify --- 292,296 ---- <one line to give the program's name and a brief idea of what it does.> ! Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify *************** *** 314,318 **** when it starts in an interactive mode: ! Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it --- 314,318 ---- when it starts in an interactive mode: ! Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it Index: ChangeLog =================================================================== RCS file: /cvsroot/gnupos/quick-gui/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChangeLog 30 Dec 2002 13:56:07 -0000 1.2 --- ChangeLog 13 Jan 2003 11:57:08 -0000 1.3 *************** *** 1,11 **** ! 2002-12-30 gettextize <bug...@gn...> * Makefile.am (SUBDIRS): Remove intl. ! 2002-12-30 gettextize <bug...@gn...> * Makefile.am (SUBDIRS): Remove intl. ! 2002-12-30 gettextize <bug...@gn...> * Makefile.am (SUBDIRS): Add m4. --- 1,38 ---- ! 2003-01-09 gettextize <bug...@gn...> ! ! ! 2003-01-08 gettextize <bug...@gn...> ! ! ! 2003-01-08 gettextize <bug...@gn...> ! ! ! 2003-01-08 gettextize <bug...@gn...> ! ! ! 2003-01-08 gettextize <bug...@gn...> ! ! ! 2003-01-08 gettextize <bug...@gn...> ! ! ! 2003-01-08 gettextize <bug...@gn...> ! ! ! 2003-01-08 gettextize <bug...@gn...> ! ! ! 2003-01-08 gettextize <bug...@gn...> ! ! ! 2003-01-06 gettextize <bug...@gn...> * Makefile.am (SUBDIRS): Remove intl. ! 2003-01-06 gettextize <bug...@gn...> * Makefile.am (SUBDIRS): Remove intl. ! 2003-01-06 gettextize <bug...@gn...> * Makefile.am (SUBDIRS): Add m4. Index: Makefile.am =================================================================== RCS file: /cvsroot/gnupos/quick-gui/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 30 Dec 2002 13:56:07 -0000 1.2 --- Makefile.am 13 Jan 2003 11:57:08 -0000 1.3 *************** *** 1,9 **** ## Process this file with automake to produce Makefile.in ! SUBDIRS = m4 po macros src intl EXTRA_DIST = config.rpath \ autogen.sh \ ! gnupos.glade install-data-local: --- 1,9 ---- ## Process this file with automake to produce Makefile.in ! SUBDIRS = m4 po macros src EXTRA_DIST = config.rpath \ autogen.sh \ ! quick-gui.glade install-data-local: Index: autogen.sh =================================================================== RCS file: /cvsroot/gnupos/quick-gui/autogen.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** autogen.sh 30 Dec 2002 13:56:07 -0000 1.2 --- autogen.sh 13 Jan 2003 11:57:08 -0000 1.3 *************** *** 3,6 **** --- 3,7 ---- automake + autoconf ./configure *************** *** 10,14 **** #PKG_NAME="the package." ! # (test -f $srcdir/configure.in) || { # echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" # echo " top-level directory" --- 11,15 ---- #PKG_NAME="the package." ! #(test -f $srcdir/configure.in) || { # echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" # echo " top-level directory" Index: configure.in =================================================================== RCS file: /cvsroot/gnupos/quick-gui/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in 6 Jan 2003 06:04:54 -0000 1.3 --- configure.in 13 Jan 2003 11:57:08 -0000 1.4 *************** *** 2,6 **** AC_INIT(configure.in) ! AM_INIT_AUTOMAKE(quick-gui, 0.2) AM_CONFIG_HEADER(config.h) --- 2,6 ---- AC_INIT(configure.in) ! AM_INIT_AUTOMAKE(quick-gui, 0.1) AM_CONFIG_HEADER(config.h) *************** *** 19,23 **** dnl Add the languages which your application supports here. ALL_LINGUAS="" ! AM_GNU_GETTEXT dnl Set PACKAGE_LOCALE_DIR in config.h. --- 19,23 ---- dnl Add the languages which your application supports here. ALL_LINGUAS="" ! AM_GNU_GETTEXT(external) dnl Set PACKAGE_LOCALE_DIR in config.h. *************** *** 32,36 **** macros/Makefile src/Makefile - intl/Makefile po/Makefile.in ]) --- 32,35 ---- Index: mkinstalldirs =================================================================== RCS file: /cvsroot/gnupos/quick-gui/mkinstalldirs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 |
From: <con...@us...> - 2003-01-13 11:55:24
|
Update of /cvsroot/gnupos/gnupos/src In directory sc8-pr-cvs1:/tmp/cvs-serv10995/src Modified Files: Makefile.in Log Message: Added gspl file for quick-gui interface. Index: Makefile.in =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 30 Dec 2002 02:17:18 -0000 1.4 --- Makefile.in 13 Jan 2003 11:55:20 -0000 1.5 *************** *** 60,63 **** --- 60,65 ---- host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ + AWK = @AWK@ BUILD_GUILE = @BUILD_GUILE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ *************** *** 65,68 **** --- 67,72 ---- CC = @CC@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ + EXEEXT = @EXEEXT@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ *************** *** 88,91 **** --- 92,96 ---- GUILE_LIBS = @GUILE_LIBS@ HAVE_LIB = @HAVE_LIB@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 101,104 **** --- 106,110 ---- MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ + OBJEXT = @OBJEXT@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ *************** *** 118,123 **** --- 124,132 ---- XPM_LIBS = @XPM_LIBS@ ZVT_LIBS = @ZVT_LIBS@ + am__include = @am__include@ + am__quote = @am__quote@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ top_builddir = @top_builddir@ |
From: <con...@us...> - 2003-01-13 11:55:23
|
Update of /cvsroot/gnupos/gnupos In directory sc8-pr-cvs1:/tmp/cvs-serv10995 Added Files: samplekeymap-qg.gspl Log Message: Added gspl file for quick-gui interface. --- NEW FILE: samplekeymap-qg.gspl --- <?xml version="1.0"?> <gnp:GnuPOS xmlns:gnp="http://www.gnucash.org/gnuPOS/Statefile/1.1"> <gnp:initialisation> <gnp:startstate>Clear</gnp:startstate> <gnp:userinterface>quick-gui</gnp:userinterface> <gnp:ui_event_loop>qg_event_loop</gnp:ui_event_loop> </gnp:initialisation> <gnp:definitions> <gnp:library> <gnp:path>/home/conrad/gnuPOS/quick-gui/src/quick-gui.gspl</gnp:path> <gnp:type>internal</gnp:type> </gnp:library> <gnp:library> <gnp:path>/home/conrad/gnuPOS/gnupos/stateslib.xml</gnp:path> <gnp:type>internal</gnp:type> </gnp:library> <gnp:register name="subtotal"> <gnp:mode>Normal</gnp:mode> <gnp:displayname>Sub Total</gnp:displayname> </gnp:register> </gnp:definitions> <gnp:states> <gnp:setstate name="Clear"> <gnp:input key="%decimal"> <gnp:perform>(gnp:add "inputstring" "key")(gnp:add "display" "key")</gnp:perform> <gnp:endstate>numeric</gnp:endstate> </gnp:input> <gnp:input key="Escape"> <gnp:perform>((gnp:quit))</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="F12"> <gnp:perform>(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:helptext>You may enter any numeric character. The calculator is currently clear. You may enter F12 to clear the current input. You may enter ESC to quit.</gnp:helptext> </gnp:setstate> </gnp:states> </gnp:GnuPOS> |
From: <con...@us...> - 2003-01-13 11:55:23
|
Update of /cvsroot/gnupos/gnupos/macros In directory sc8-pr-cvs1:/tmp/cvs-serv10995/macros Modified Files: Makefile.in Log Message: Added gspl file for quick-gui interface. Index: Makefile.in =================================================================== RCS file: /cvsroot/gnupos/gnupos/macros/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 30 Dec 2002 02:17:18 -0000 1.4 --- Makefile.in 13 Jan 2003 11:55:20 -0000 1.5 *************** *** 60,63 **** --- 60,65 ---- host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ + AWK = @AWK@ BUILD_GUILE = @BUILD_GUILE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ *************** *** 65,68 **** --- 67,72 ---- CC = @CC@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ + EXEEXT = @EXEEXT@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ *************** *** 88,91 **** --- 92,96 ---- GUILE_LIBS = @GUILE_LIBS@ HAVE_LIB = @HAVE_LIB@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 101,104 **** --- 106,110 ---- MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ + OBJEXT = @OBJEXT@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ *************** *** 118,123 **** --- 124,132 ---- XPM_LIBS = @XPM_LIBS@ ZVT_LIBS = @ZVT_LIBS@ + am__include = @am__include@ + am__quote = @am__quote@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ top_builddir = @top_builddir@ |
From: <con...@us...> - 2003-01-12 01:11:52
|
Update of /cvsroot/gnupos/quick-gui/src In directory sc8-pr-cvs1:/tmp/cvs-serv22296 Removed Files: .callbacks.c.swp Log Message: Fixes to make CVS behave again. I broke it somehow. --- .callbacks.c.swp DELETED --- |
From: <con...@us...> - 2003-01-06 06:07:47
|
Update of /cvsroot/gnupos/quick-gui/m4 In directory sc8-pr-cvs1:/tmp/cvs-serv25881 Added Files: ChangeLog Makefile.am Makefile.in codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 Log Message: Add missing files? --- NEW FILE: ChangeLog --- 2002-12-28 gettextize <bug...@gn...> * codeset.m4: New file, from gettext-0.11.1. * gettext.m4: New file, from gettext-0.11.1. * glibc21.m4: New file, from gettext-0.11.1. * iconv.m4: New file, from gettext-0.11.1. * isc-posix.m4: New file, from gettext-0.11.1. * lcmessage.m4: New file, from gettext-0.11.1. * lib-ld.m4: New file, from gettext-0.11.1. * lib-link.m4: New file, from gettext-0.11.1. * lib-prefix.m4: New file, from gettext-0.11.1. * progtest.m4: New file, from gettext-0.11.1. * Makefile.am: New file. --- NEW FILE: Makefile.am --- EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 --- NEW FILE: Makefile.in --- # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ sbindir = @sbindir@ libexecdir = @libexecdir@ datadir = @datadir@ sysconfdir = @sysconfdir@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : CC = @CC@ EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = DIST_COMMON = ChangeLog Makefile.am Makefile.in PACKAGE = @PACKAGE@ VERSION = @VERSION@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status tags: TAGS TAGS: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = m4 distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu m4/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done info-am: info: info-am dvi-am: dvi: dvi-am check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am install-exec-am: install-exec: install-exec-am install-data-am: install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am uninstall-am: uninstall: uninstall-am all-am: Makefile all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: mostlyclean-am: mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-generic clean-am distclean: distclean-am maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am .PHONY: tags distdir info-am info dvi-am dvi check check-am \ installcheck-am installcheck install-exec-am install-exec \ install-data-am install-data install-am install uninstall-am uninstall \ all-redirect all-am all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE: codeset.m4 --- # codeset.m4 serial AM1 (gettext-0.10.40) dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. AC_DEFUN([AM_LANGINFO_CODESET], [ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, [AC_TRY_LINK([#include <langinfo.h>], [char* cs = nl_langinfo(CODESET);], am_cv_langinfo_codeset=yes, am_cv_langinfo_codeset=no) ]) if test $am_cv_langinfo_codeset = yes; then AC_DEFINE(HAVE_LANGINFO_CODESET, 1, [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) fi ]) --- NEW FILE: gettext.m4 --- # gettext.m4 serial 13 (gettext-0.11.1) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <dr...@cy...>, 1995-2000. dnl Bruno Haible <ha...@cl...>, 2000-2002. dnl Macro to add for using GNU gettext. dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The dnl default (if it is not specified or empty) is 'no-libtool'. dnl INTLSYMBOL should be 'external' for packages with no intl directory, dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. dnl If INTLSYMBOL is 'use-libtool', then a libtool library dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, dnl depending on --{enable,disable}-{shared,static} and on the presence of dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library dnl $(top_builddir)/intl/libintl.a will be created. dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext dnl implementations (in libc or libintl) without the ngettext() function dnl will be ignored. dnl INTLDIR is used to find the intl libraries. If empty, dnl the value `$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled dnl and used. dnl Catalog format: GNU --> install in $(datadir) dnl Catalog extension: .mo after installation, .gmo in source tree dnl 2) GNU gettext has been found in the system's C library. dnl Catalog format: GNU --> install in $(datadir) dnl Catalog extension: .mo after installation, .gmo in source tree dnl 3) No internationalization, always use English msgid. dnl Catalog format: none dnl Catalog extension: none dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. dnl The use of .gmo is historical (it was needed to avoid overwriting the dnl GNU format catalogs when building on a platform with an X/Open gettext), dnl but we keep it in order not to force irrelevant filename changes on the dnl maintainers. dnl AC_DEFUN([AM_GNU_GETTEXT], [ dnl Argument checking. ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])]) define(gt_included_intl, ifelse([$1], [external], [no], [yes])) define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) AC_REQUIRE([AM_PO_SUBDIRS])dnl ifelse(gt_included_intl, yes, [ AC_REQUIRE([AM_INTL_SUBDIR])dnl ]) dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) AC_MSG_RESULT($USE_NLS) AC_SUBST(USE_NLS) ifelse(gt_included_intl, yes, [ BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no ]) LIBINTL= LTLIBINTL= POSUB= dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then ]) dnl User does not insist on using GNU NLS library. Figure out what dnl to use. If GNU gettext is available we use this. Else we have dnl to fall back to GNU NLS library. dnl Add a version number to the cache macros. define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1)) define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, [AC_TRY_LINK([#include <libintl.h> extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings;], [bindtextdomain ("", ""); return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], gt_cv_func_gnugettext_libc=yes, gt_cv_func_gnugettext_libc=no)]) if test "$gt_cv_func_gnugettext_libc" != "yes"; then dnl Sometimes libintl requires libiconv, so first search for libiconv. ifelse(gt_included_intl, yes, , [ AM_ICONV_LINK ]) dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) dnl because that would add "-liconv" to LIBINTL and LTLIBINTL dnl even if libiconv doesn't exist. AC_LIB_LINKFLAGS_BODY([intl]) AC_CACHE_CHECK([for GNU gettext in libintl], gt_cv_func_gnugettext_libintl, [gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. AC_TRY_LINK([#include <libintl.h> extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias ();], [bindtextdomain ("", ""); return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)], gt_cv_func_gnugettext_libintl=yes, gt_cv_func_gnugettext_libintl=no) dnl Now see whether libintl exists and depends on libiconv. if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" AC_TRY_LINK([#include <libintl.h> extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias ();], [bindtextdomain ("", ""); return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)], [LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" gt_cv_func_gnugettext_libintl=yes ]) fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS"]) fi dnl If an already present or preinstalled GNU gettext() is found, dnl use it. But if this macro is used in GNU gettext, and GNU dnl gettext is already preinstalled in libintl, we update this dnl libintl. (Cf. the install rule in intl/Makefile.in.) if test "$gt_cv_func_gnugettext_libc" = "yes" \ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ && test "$PACKAGE" != gettext; }; then gt_use_preinstalled_gnugettext=yes else dnl Reset the values set by searching for libintl. LIBINTL= LTLIBINTL= INCINTL= fi ifelse(gt_included_intl, yes, [ if test "$gt_use_preinstalled_gnugettext" != "yes"; then dnl GNU gettext is not found in the C library. dnl Fall back on included GNU gettext library. nls_cv_use_gnu_gettext=yes fi fi if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. INTLOBJS="\$(GETTOBJS)" BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions to use GNU gettext tools. CATOBJEXT=.gmo fi ]) if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.]) else USE_NLS=no fi fi if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then if test "$gt_cv_func_gnugettext_libintl" = "yes"; then AC_MSG_CHECKING([how to link with libintl]) AC_MSG_RESULT([$LIBINTL]) AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) fi dnl For backward compatibility. Some packages may be using this. AC_DEFINE(HAVE_GETTEXT, 1, [Define if the GNU gettext() function is already present or preinstalled.]) AC_DEFINE(HAVE_DCGETTEXT, 1, [Define if the GNU dcgettext() function is already present or preinstalled.]) fi dnl We need to process the po/ directory. POSUB=po fi ifelse(gt_included_intl, yes, [ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL dnl to 'yes' because some of the testsuite requires it. if test "$PACKAGE" = gettext; then BUILD_INCLUDED_LIBINTL=yes fi dnl Make all variables we use known to autoconf. AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST(CATOBJEXT) AC_SUBST(INTLOBJS) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= nls_cv_header_libgt= dnl For backward compatibility. Some Makefiles may be using this. DATADIRNAME=share AC_SUBST(DATADIRNAME) dnl For backward compatibility. Some Makefiles may be using this. INSTOBJEXT=.mo AC_SUBST(INSTOBJEXT) dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat AC_SUBST(GENCAT) dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" AC_SUBST(INTLLIBS) dnl Make all documented variables known to autoconf. AC_SUBST(LIBINTL) AC_SUBST(LTLIBINTL) AC_SUBST(POSUB) ]) dnl Checks for all prerequisites of the po subdirectory, dnl except for USE_NLS. AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl AC_REQUIRE([AM_MKINSTALLDIRS])dnl dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. dnl Search for GNU msgfmt in the PATH. dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. dnl The second test excludes FreeBSD msgfmt. AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) dnl Search for GNU xgettext 0.11 or newer in the PATH. dnl The first test excludes Solaris xgettext and early GNU xgettext versions. dnl The second test excludes FreeBSD xgettext. AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) dnl Remove leftover from FreeBSD xgettext call. rm -f messages.po dnl Search for GNU msgmerge 0.11 or newer in the PATH. AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. dnl Test whether we really found GNU msgfmt. if test "$GMSGFMT" != ":"; then dnl If it is no GNU msgfmt we define it as : so that the dnl Makefiles still can work. if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then : ; else GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` AC_MSG_RESULT( [found $GMSGFMT program is not GNU msgfmt; ignore it]) GMSGFMT=":" fi fi dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. dnl Test whether we really found GNU xgettext. if test "$XGETTEXT" != ":"; then dnl If it is no GNU xgettext we define it as : so that the dnl Makefiles still can work. if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then : ; else AC_MSG_RESULT( [found xgettext program is not GNU xgettext; ignore it]) XGETTEXT=":" fi dnl Remove leftover from FreeBSD xgettext call. rm -f messages.po fi AC_OUTPUT_COMMANDS([ for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" case "$ac_file" in *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; esac # PO directories have a Makefile.in generated from Makefile.in.in. case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" case "$ac_given_srcdir" in .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; /*) top_srcdir="$ac_given_srcdir" ;; *) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend # on $ac_dir but don't depend on user-specified configuration # parameters. if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then # The LINGUAS file contains the set of available languages. if test -n "$ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' fi case "$ac_given_srcdir" in .) srcdirpre= ;; *) srcdirpre='$(srcdir)/' ;; esac POFILES= GMOFILES= UPDATEPOFILES= DUMMYPOFILES= for lang in $ALL_LINGUAS; do POFILES="$POFILES $srcdirpre$lang.po" GMOFILES="$GMOFILES $srcdirpre$lang.gmo" UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" DUMMYPOFILES="$DUMMYPOFILES $lang.nop" done # CATALOGS depends on both $ac_dir and the user's LINGUAS # environment variable. INST_LINGUAS= if test -n "$ALL_LINGUAS"; then for presentlang in $ALL_LINGUAS; do useit=no if test "%UNSET%" != "$LINGUAS"; then desiredlanguages="$LINGUAS" else desiredlanguages="$ALL_LINGUAS" fi for desiredlang in $desiredlanguages; do # Use the presentlang catalog if desiredlang is # a. equal to presentlang, or # b. a variant of presentlang (because in this case, # presentlang can be used as a fallback for messages # which are not translated in the desiredlang catalog). case "$desiredlang" in "$presentlang"*) useit=yes;; esac done if test $useit = yes; then INST_LINGUAS="$INST_LINGUAS $presentlang" fi done fi CATALOGS= if test -n "$INST_LINGUAS"; then for lang in $INST_LINGUAS; do CATALOGS="$CATALOGS $lang.gmo" done fi test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do if test -f "$f"; then case "$f" in *.orig | *.bak | *~) ;; *) cat "$f" >> "$ac_dir/Makefile" ;; esac fi done fi ;; esac done], [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it # from automake. eval 'ALL_LINGUAS''="$ALL_LINGUAS"' # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" ]) ]) dnl Checks for all prerequisites of the intl subdirectory, dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. AC_DEFUN([AM_INTL_SUBDIR], [ AC_REQUIRE([AC_PROG_INSTALL])dnl AC_REQUIRE([AM_MKINSTALLDIRS])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_ISC_POSIX])dnl AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_C_CONST])dnl AC_REQUIRE([AC_C_INLINE])dnl AC_REQUIRE([AC_TYPE_OFF_T])dnl AC_REQUIRE([AC_TYPE_SIZE_T])dnl AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl AC_REQUIRE([jm_GLIBC21])dnl AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h]) AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) AM_ICONV AM_LANGINFO_CODESET AM_LC_MESSAGES dnl intl/plural.c is generated from intl/plural.y. It requires bison, dnl because plural.y uses bison specific features. It requires at least dnl bison-1.26 because earlier versions generate a plural.c that doesn't dnl compile. dnl bison is only needed for the maintainer (who touches plural.y). But in dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put dnl the rule in general Makefile. Now, some people carelessly touch the dnl files or have a broken "make" program, hence the plural.c rule will dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not dnl present or too old. AC_CHECK_PROGS([INTLBISON], [bison]) if test -z "$INTLBISON"; then ac_verc_fail=yes else dnl Found it, now check the version. AC_MSG_CHECKING([version of bison]) changequote(<<,>>)dnl ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) changequote([,])dnl ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac AC_MSG_RESULT([$ac_prog_version]) fi if test $ac_verc_fail = yes; then INTLBISON=: fi ]) AC_DEFUN([AM_MKINSTALLDIRS], [ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly dnl find the mkinstalldirs script in another subdir but $(top_srcdir). dnl Try to locate is. MKINSTALLDIRS= if test -n "$ac_aux_dir"; then MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" fi if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" fi AC_SUBST(MKINSTALLDIRS) ]) --- NEW FILE: glibc21.m4 --- # glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. # Test for the GNU C Library, version 2.1 or newer. # From Bruno Haible. AC_DEFUN([jm_GLIBC21], [ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, ac_cv_gnu_library_2_1, [AC_EGREP_CPP([Lucky GNU user], [ #include <features.h> #ifdef __GNU_LIBRARY__ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) Lucky GNU user #endif #endif ], ac_cv_gnu_library_2_1=yes, ac_cv_gnu_library_2_1=no) ] ) AC_SUBST(GLIBC21) GLIBC21="$ac_cv_gnu_library_2_1" ] ) --- NEW FILE: iconv.m4 --- # iconv.m4 serial AM3 (gettext-0.11) dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. AC_DEFUN([AM_ICONV_LINK], [ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl those with the standalone portable GNU libiconv installed). dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV dnl accordingly. AC_LIB_LINKFLAGS_BODY([iconv]) dnl Add $INCICONV to CPPFLAGS before performing the following checks, dnl because if the user has installed libiconv and not disabled its use dnl via --without-libiconv-prefix, he wants to use it. The first dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no AC_TRY_LINK([#include <stdlib.h> #include <iconv.h>], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], am_cv_func_iconv=yes) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" AC_TRY_LINK([#include <stdlib.h> #include <iconv.h>], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], am_cv_lib_iconv=yes am_cv_func_iconv=yes) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) fi if test "$am_cv_lib_iconv" = yes; then AC_MSG_CHECKING([how to link with libiconv]) AC_MSG_RESULT([$LIBICONV]) else dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV dnl either. CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= LTLIBICONV= fi AC_SUBST(LIBICONV) AC_SUBST(LTLIBICONV) ]) AC_DEFUN([AM_ICONV], [ AC_REQUIRE([AM_ICONV_LINK]) if test "$am_cv_func_iconv" = yes; then AC_MSG_CHECKING([for iconv declaration]) AC_CACHE_VAL(am_cv_proto_iconv, [ AC_TRY_COMPILE([ #include <stdlib.h> #include <iconv.h> extern #ifdef __cplusplus "C" #endif #if defined(__STDC__) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else size_t iconv(); #endif ], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` AC_MSG_RESULT([$]{ac_t:- }[$]am_cv_proto_iconv) AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, [Define as const if the declaration of iconv() needs const.]) fi ]) --- NEW FILE: isc-posix.m4 --- # isc-posix.m4 serial 1 (gettext-0.10.40) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. # This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro # because gettext's gettext.m4 (distributed in the automake package) # still uses it. Otherwise, the use in gettext.m4 makes autoheader # give these diagnostics: # configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX # configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX undefine([AC_ISC_POSIX]) AC_DEFUN([AC_ISC_POSIX], [ dnl This test replaces the obsolescent AC_ISC_POSIX kludge. AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) ] ) --- NEW FILE: lcmessage.m4 --- # lcmessage.m4 serial 2 (gettext-0.10.40) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <dr...@cy...>, 1995. # Check whether LC_MESSAGES is available in <locale.h>. AC_DEFUN([AM_LC_MESSAGES], [if test $ac_cv_header_locale_h = yes; then AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) if test $am_cv_val_LC_MESSAGES = yes; then AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your <locale.h> file defines LC_MESSAGES.]) fi fi]) --- NEW FILE: lib-ld.m4 --- # lib-ld.m4 serial 1 (gettext-0.11) dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl Subroutines of libtool.m4, dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision dnl with libtool.m4. dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then acl_cv_prog_gnu_ld=yes else acl_cv_prog_gnu_ld=no fi]) with_gnu_ld=$acl_cv_prog_gnu_ld ]) dnl From libtool-1.4. Sets the variable LD. AC_DEFUN([AC_LIB_PROG_LD], [AC_ARG_WITH(gnu-ld, [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by GCC]) case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; esac case $ac_prog in # Accept absolute paths. [[\\/]* | [A-Za-z]:[\\/]*)] [re_direlt='/[^/][^/]*/\.\./'] # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; "") # If it fails, then pretend we aren't using GCC. ac_prog=ld ;; *) # If it is relative, then search for the first ld in PATH. with_gnu_ld=unknown ;; esac elif test "$with_gnu_ld" = yes; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(acl_cv_path_LD, [if test -z "$LD"; then IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then test "$with_gnu_ld" != no && break else test "$with_gnu_ld" != yes && break fi fi done IFS="$ac_save_ifs" else acl_cv_path_LD="$LD" # Let the user override the test with a path. fi]) LD="$acl_cv_path_LD" if test -n "$LD"; then AC_MSG_RESULT($LD) else AC_MSG_RESULT(no) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU ]) --- NEW FILE: lib-link.m4 --- # lib-link.m4 serial 1 (gettext-0.11) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and dnl augments the CPPFLAGS variable. AC_DEFUN([AC_LIB_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) define([Name],[translit([$1],[./-], [___])]) define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ac_cv_lib[]Name[]_libs="$LIB[]NAME" ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" ac_cv_lib[]Name[]_cppflags="$INC[]NAME" ]) LIB[]NAME="$ac_cv_lib[]Name[]_libs" LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" INC[]NAME="$ac_cv_lib[]Name[]_cppflags" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the dnl results of this search when this library appears as a dependency. HAVE_LIB[]NAME=yes undefine([Name]) undefine([NAME]) ]) dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) dnl searches for libname and the libraries corresponding to explicit and dnl implicit dependencies, together with the specified include files and dnl the ability to compile and link the specified testcode. If found, it dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) define([Name],[translit([$1],[./-], [___])]) define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME dnl accordingly. AC_LIB_LINKFLAGS_BODY([$1], [$2]) dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, dnl because if the user has installed lib[]Name and not disabled its use dnl via --without-lib[]Name-prefix, he wants to use it. ac_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ ac_save_LIBS="$LIBS" LIBS="$LIBS $LIB[]NAME" AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) LIBS="$ac_save_LIBS" ]) if test "$ac_cv_lib[]Name" = yes; then HAVE_LIB[]NAME=yes AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) AC_MSG_CHECKING([how to link with lib[]$1]) AC_MSG_RESULT([$LIB[]NAME]) else HAVE_LIB[]NAME=no dnl If $LIB[]NAME didn't lead to a usable library, we don't need dnl $INC[]NAME either. CPPFLAGS="$ac_save_CPPFLAGS" LIB[]NAME= LTLIB[]NAME= fi AC_SUBST([HAVE_LIB]NAME) AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) undefine([Name]) undefine([NAME]) ]) dnl Determine the platform dependent parameters needed to use rpath: dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, dnl hardcode_direct, hardcode_minus_L, dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec. AC_DEFUN([AC_LIB_RPATH], [ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh . ./conftest.sh rm -f ./conftest.sh acl_cv_rpath=done ]) wl="$acl_cv_wl" libext="$acl_cv_libext" shlibext="$acl_cv_shlibext" hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" hardcode_direct="$acl_cv_hardcode_direct" hardcode_minus_L="$acl_cv_hardcode_minus_L" sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" ]) dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) AC_ARG_WITH([lib$1-prefix], [ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib --without-lib$1-prefix don't search for lib$1 in includedir and libdir], [ if test "X$withval" = "Xno"; then use_additional=no else if test "X$withval" = "X"; then AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) else additional_includedir="$withval/include" additional_libdir="$withval/lib" fi fi ]) dnl Search the library and its dependencies in $additional_libdir and dnl $LDFLAGS. Using breadth-first-seach. LIB[]NAME= LTLIB[]NAME= INC[]NAME= rpathdirs= ltrpathdirs= names_already_handled= names_next_round='$1 $2' while test -n "$names_next_round"; do names_this_round="$names_next_round" names_next_round= for name in $names_this_round; do already_handled= for n in $names_already_handled; do if test "$n" = "$name"; then already_handled=yes break fi done if test -z "$already_handled"; then names_already_handled="$names_already_handled $name" dnl See if it was already located by an earlier AC_LIB_LINKFLAGS dnl or AC_LIB_HAVE_LINKFLAGS call. uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then eval value=\"\$LIB$uppername\" test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" eval value=\"\$LTLIB$uppername\" test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" else dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined dnl that this library doesn't exist. So just drop it. : fi else dnl Search the library lib$name in $additional_libdir and $LDFLAGS dnl and the already constructed $LIBNAME/$LTLIBNAME. found_dir= found_la= found_so= found_a= if test $use_additional = yes; then if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then found_dir="$additional_libdir" found_so="$additional_libdir/lib$name.$shlibext" if test -f "$additional_libdir/lib$name.la"; then found_la="$additional_libdir/lib$name.la" fi else if test -f "$additional_libdir/lib$name.$libext"; then found_dir="$additional_libdir" found_a="$additional_libdir/lib$name.$libext" if test -f "$additional_libdir/lib$name.la"; then found_la="$additional_libdir/lib$name.la" fi fi fi fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIB[]NAME; do AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then found_dir="$dir" found_so="$dir/lib$name.$shlibext" if test -f "$dir/lib$name.la"; then found_la="$dir/lib$name.la" fi else if test -f "$dir/lib$name.$libext"; then found_dir="$dir" found_a="$dir/lib$name.$libext" if test -f "$dir/lib$name.la"; then found_la="$dir/lib$name.la" fi fi fi ;; esac if test "X$found_dir" != "X"; then break fi done fi if test "X$found_dir" != "X"; then dnl Found the library. LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then dnl Linking with a shared library. We attempt to hardcode its dnl directory into the executable's runpath, unless it's the dnl standard /usr/lib. if test "X$found_dir" = "X/usr/lib"; then dnl No hardcoding is needed. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else dnl Use an explicit option to hardcode DIR into the resulting dnl binary. dnl Potentially add DIR to ltrpathdirs. dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. haveit= for x in $ltrpathdirs; do if test "X$x" = "X$found_dir"; then haveit=yes break fi done if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi dnl The hardcoding into $LIBNAME is system dependent. if test "$hardcode_direct" = yes; then dnl Using DIR/libNAME.so during linking hardcodes DIR into the dnl resulting binary. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then dnl Use an explicit option to hardcode DIR into the resulting dnl binary. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" dnl Potentially add DIR to rpathdirs. dnl The rpathdirs will be appended to $LIBNAME at the end. haveit= for x in $rpathdirs; do if test "X$x" = "X$found_dir"; then haveit=yes break fi done if test -z "$haveit"; then rpathdirs="$rpathdirs $found_dir" fi else dnl Rely on "-L$found_dir". dnl But don't add it if it's already contained in the LDFLAGS dnl or the already constructed $LIBNAME haveit= for x in $LDFLAGS $LIB[]NAME; do AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) if test "X$x" = "X-L$found_dir"; then haveit=yes break fi done if test -z "$haveit"; then LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" fi if test "$hardcode_minus_L" != no; then dnl FIXME: Not sure whether we should use dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" dnl here. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH dnl here, because this doesn't fit in flags passed to the dnl compiler. So give up. No hardcoding. This affects only dnl very old systems. dnl FIXME: Not sure whether we should use dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" dnl here. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" fi fi fi fi else if test "X$found_a" != "X"; then dnl Linking with a static library. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" else dnl We shouldn't come here, but anyway it's good to have a dnl fallback. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" fi fi dnl Assume the include files are nearby. additional_includedir= case "$found_dir" in */lib | */lib/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` additional_includedir="$basedir/include" ;; esac if test "X$additional_includedir" != "X"; then dnl Potentially add $additional_includedir to $INCNAME. dnl But don't add it dnl 1. if it's the standard /usr/include, dnl 2. if it's /usr/local/include and we are using GCC on Linux, dnl 3. if it's already present in $CPPFLAGS or the already dnl constructed $INCNAME, dnl 4. if it doesn't exist as a directory. if test "X$additional_includedir" != "X/usr/include"; then haveit= if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in linux*) haveit=yes;; esac fi fi if test -z "$haveit"; then for x in $CPPFLAGS $INC[]NAME; do AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) if test "X$x" = "X-I$additional_includedir"; then haveit=yes break fi done if test -z "$haveit"; then if test -d "$additional_includedir"; then dnl Really add $additional_includedir to $INCNAME. INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" fi fi fi fi fi dnl Look for dependencies. if test -n "$found_la"; then dnl Read the .la file. It defines the variables dnl dlname, library_names, old_library, dependency_libs, current, dnl age, revision, installed, dlopen, dlpreopen, libdir. save_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac libdir="$save_libdir" dnl We use only dependency_libs. for dep in $dependency_libs; do case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. dnl But don't add it dnl 1. if it's the standard /usr/lib, dnl 2. if it's /usr/local/lib and we are using GCC on Linux, dnl 3. if it's already present in $LDFLAGS or the already dnl constructed $LIBNAME, dnl 4. if it doesn't exist as a directory. if test "X$additional_libdir" != "X/usr/lib"; then haveit= if test "X$additional_libdir" = "X/usr/local/lib"; then if test -n "$GCC"; then case $host_os in linux*) haveit=yes;; esac fi fi if test -z "$haveit"; then haveit= for x in $LDFLAGS $LIB[]NAME; do AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) if test "X$x" = "X-L$additional_libdir"; then haveit=yes break fi done if test -z "$haveit"; then if test -d "$additional_libdir"; then dnl Really add $additional_libdir to $LIBNAME. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" fi fi haveit= for x in $LDFLAGS $LTLIB[]NAME; do AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) if test "X$x" = "X-L$additional_libdir"; then haveit=yes break fi done if test -z "$haveit"; then if test -d "$additional_libdir"; then dnl Really add $additional_libdir to $LTLIBNAME. LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" fi fi fi fi ;; -l*) dnl Handle this in the next round. names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; *.la) dnl Handle this in the next round. Throw away the .la's dnl directory; it is already contained in a preceding -L dnl option. names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` ;; *) dnl Most likely an immediate library name. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" ;; esac done fi else dnl Didn't find the library; assume it is in the system directories dnl known to the linker and runtime loader. (All the system dnl directories known to the linker should also be known to the dnl runtime loader, otherwise the system is severely misconfigured.) LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" fi fi fi done done if test "X$rpathdirs" != "X"; then if test -n "$hardcode_libdir_separator"; then dnl Weird platform: only the last -rpath option counts, the user must dnl pass all path elements in one option. We can arrange that for a dnl single library, but not when more than one $LIBNAMEs are used. alldirs= for found_dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" done dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. acl_save_libdir="$libdir" libdir="$alldirs" eval flag=\"$hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" else dnl The -rpath options are cumulative. for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" eval flag=\"$hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" done fi fi if test "X$ltrpathdirs" != "X"; then dnl When using libtool, the option that works for both libraries and dnl executables is -R. The -R options are cumulative. for found_dir in $ltrpathdirs; do LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" done fi ]) dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, dnl unless already present in VAR. dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes dnl contains two or three consecutive elements that belong together. AC_DEFUN([AC_LIB_APPEND... [truncated message content] |
From: <con...@us...> - 2003-01-06 06:06:13
|
Update of /cvsroot/gnupos/quick-gui/m4 In directory sc8-pr-cvs1:/tmp/cvs-serv25598/m4 Log Message: Directory /cvsroot/gnupos/quick-gui/m4 added to the repository |
From: <con...@us...> - 2003-01-06 06:05:45
|
Update of /cvsroot/gnupos/quick-gui/intl In directory sc8-pr-cvs1:/tmp/cvs-serv25506/intl Log Message: Directory /cvsroot/gnupos/quick-gui/intl added to the repository |
From: <con...@us...> - 2003-01-06 06:05:03
|
Update of /cvsroot/gnupos/quick-gui In directory sc8-pr-cvs1:/tmp/cvs-serv25277 Modified Files: configure.in Added Files: ABOUT-NLS COPYING INSTALL mkinstalldirs Log Message: Add missing build files. --- NEW FILE: ABOUT-NLS --- Notes on the Free Translation Project ************************************* Free software is going international! The Free Translation Project is a way to get maintainers of free software, translators, and users all together, so that will gradually become able to speak many languages. A few packages already provide translations for their messages. If you found this `ABOUT-NLS' file inside a distribution, you may assume that the distributed package does use GNU `gettext' internally, itself available at your nearest GNU archive site. But you do _not_ need to install GNU `gettext' prior to configuring, installing or using this package with messages translated. Installers will find here some useful hints. These notes also explain how users should proceed for getting the programs to use the available translations. They tell how people wanting to contribute and work at translations should contact the appropriate team. When reporting bugs in the `intl/' directory or bugs which may be related to internationalization, you should tell about the version of `gettext' which is used. The information can be found in the `intl/VERSION' file, in internationalized packages. Quick configuration advice ========================== If you want to exploit the full power of internationalization, you should configure it using ./configure --with-included-gettext to force usage of internationalizing routines provided within this package, despite the existence of internationalizing capabilities in the operating system where this package is being installed. So far, only the `gettext' implementation in the GNU C library version 2 provides as many features (such as locale alias, message inheritance, automatic charset conversion or plural form handling) as the implementation here. It is also not possible to offer this additional functionality on top of a `catgets' implementation. Future versions of GNU `gettext' will very likely convey even more functionality. So it might be a good idea to change to GNU `gettext' as soon as possible. So you need _not_ provide this option if you are using GNU libc 2 or you have installed a recent copy of the GNU gettext package with the included `libintl'. INSTALL Matters =============== Some packages are "localizable" when properly installed; the programs they contain can be made to speak your own native language. Most such packages use GNU `gettext'. Other packages have their own ways to internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already provides the GNU `gettext' functions. If not, the GNU `gettext' own library will be used. This library is wholly contained within this package, usually in the `intl/' subdirectory, so prior installation of the GNU `gettext' package is _not_ required. Installers may use special options at configuration time for changing the default behaviour. The commands: ./configure --with-included-gettext ./configure --disable-nls will respectively bypass any pre-existing `gettext' to use the internationalizing routines provided within this package, or else, _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will probably detect the previously built and installed `libintl.a' file and will decide to use this. This might be not what is desirable. You should use the more recent version of the GNU `gettext' library. I.e. if the file `intl/VERSION' shows that the library which comes with this package is more recent, you should use ./configure --with-included-gettext to prevent auto-detection. The configuration process will not test for the `catgets' function and therefore it will not be used. The reason is that even an emulation of `gettext' on top of `catgets' could not provide all the extensions of the GNU `gettext' library. Internationalized packages have usually many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless translations have been forbidden at `configure' time by using the `--disable-nls' switch, all available translations are installed together with the package. However, the environment variable `LINGUAS' may be set, prior to configuration, to limit the installed set. `LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. Using This Package ================== As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate `LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, and `CC' is an ISO 3166 two-letter country code. For example, let's suppose that you speak German and live in Germany. At the shell prompt, merely execute `setenv LANG de_DE' (in `csh'), `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). This can be done from your `.login' or `.profile' file, once and for all. You might think that the country code specification is redundant. But in fact, some languages have dialects in different countries. For example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The country code serves to distinguish the dialects. The locale naming convention of `LL_CC', with `LL' denoting the language and `CC' denoting the country, is the one use on systems based on GNU libc. On other systems, some variations of this scheme are used, such as `LL' or `LL_CC.ENCODING'. You can get the list of locales supported by your system for your country by running the command `locale -a | grep '^LL''. Not all programs have translations for all languages. By default, an English message is shown in place of a nonexistent translation. If you understand other languages, you can set up a priority list of languages. This is done through a different environment variable, called `LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' for the purpose of message handling, but you still need to have `LANG' set to the primary language; this is required by other parts of the system libraries. For example, some Swedish users who would rather read translations in German than English for when Swedish is not available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. In the `LANGUAGE' environment variable, but not in the `LANG' environment variable, `LL_CC' combinations can be abbreviated as `LL' to denote the language's main dialect. For example, `de' is equivalent to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' (Portuguese as spoken in Portugal) in this context. Translating Teams ================= For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, `http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" area. If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. The subscribing address is _not_ the same as the list itself, it has `-request' appended. For example, speakers of Swedish can send a message to `sv-...@li...', having this message body: subscribe Keep in mind that team members are expected to participate _actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to get started, please write to `tra...@ir...' to reach the coordinator for all translator teams. The English team is special. It works at improving and uniformizing the terminology in use. Proven linguistic skill are praised more than programming skill, here. Available Packages ================== Languages are not equally supported in all packages. The following matrix shows the current state of internationalization, as of March 2002. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. Ready PO files bg ca cs da de el en eo es et fi fr +-------------------------------------+ a2ps | [] [] [] [] | bash | [] [] [] [] | bfd | [] [] | binutils | [] [] | bison | [] [] [] | clisp | [] [] [] [] | cpio | [] [] [] [] | diffutils | [] [] [] [] [] [] | enscript | [] [] | error | [] [] | fetchmail | () [] [] [] () | fileutils | [] [] [] [] [] | findutils | [] [] [] [] [] | flex | [] [] [] [] | gas | [] [] | gawk | [] [] | gcal | [] [] | gcc | [] [] | gettext | [] [] [] [] [] | gnupg | [] [] [] [] [] [] | gprof | [] [] | grep | [] [] [] [] [] [] | hello | [] [] [] [] [] [] [] [] | id-utils | [] [] [] | indent | [] [] [] [] [] | jpilot | () [] [] [] | jwhois | [] [] | kbd | [] [] | ld | [] [] | libc | [] [] [] [] [] [] [] | lilypond | [] [] | lynx | [] [] [] [] | m4 | [] [] [] [] [] | make | [] [] [] [] | mysecretdiary | [] [] | nano | [] () [] [] [] [] | nano_1_0 | [] () [] [] [] [] | opcodes | [] [] [] | parted | [] [] [] [] | ptx | [] [] [] [] [] | python | | recode | [] [] [] [] [] [] | sed | [] [] [] [] [] [] [] [] | sh-utils | [] [] [] [] [] [] [] [] | sharutils | [] [] [] [] [] [] | sketch | () [] () | soundtracker | [] [] [] | sp | | tar | [] [] [] [] [] [] | texinfo | [] [] [] [] [] | textutils | [] [] [] [] [] | util-linux | [] [] [] [] | vorbis-tools | | wdiff | [] [] [] [] [] | wget | [] [] [] [] [] [] [] [] | +-------------------------------------+ bg ca cs da de el en eo es et fi fr 1 12 11 31 36 9 1 8 39 15 1 50 gl he hr hu id it ja ko lv nb nl nn +-------------------------------------+ a2ps | () () [] | bash | | bfd | [] | binutils | [] | bison | [] [] | clisp | [] | cpio | [] [] [] | diffutils | [] [] [] | enscript | [] | error | [] | fetchmail | | fileutils | [] [] [] | findutils | [] [] [] [] [] [] | flex | [] | gas | | gawk | [] | gcal | | gcc | | gettext | [] | gnupg | [] [] [] | gprof | | grep | [] | hello | [] [] [] [] [] [] [] [] [] [] | id-utils | [] | indent | [] [] [] | jpilot | () () | jwhois | | kbd | | ld | | libc | [] [] [] [] | lilypond | [] [] | lynx | [] [] | m4 | [] [] [] [] | make | [] [] [] [] | mysecretdiary | | nano | [] [] [] () [] () [] | nano_1_0 | [] [] [] () [] () [] | opcodes | [] | parted | [] [] [] | ptx | [] [] [] [] | python | | recode | [] [] [] | sed | [] [] [] [] [] [] [] | sh-utils | [] [] [] [] [] | sharutils | [] [] [] | sketch | () | soundtracker | [] | sp | | tar | [] [] [] | texinfo | [] [] | textutils | [] [] | util-linux | () [] | vorbis-tools | | wdiff | | wget | [] [] [] [] [] | +-------------------------------------+ gl he hr hu id it ja ko lv nb nl nn 19 7 0 4 6 11 22 9 1 8 19 4 no pl pt pt_BR ru sk sl sv tr uk zh_TW +----------------------------------------+ a2ps | () () () [] [] [] () | 8 bash | | 4 bfd | [] [] | 5 binutils | [] | 4 bison | [] [] [] | 8 clisp | | 5 cpio | [] [] [] [] | 11 diffutils | [] [] [] [] [] | 14 enscript | [] [] [] | 6 error | [] [] [] | 6 fetchmail | () () [] | 4 fileutils | [] [] [] [] | 12 findutils | [] [] [] [] [] [] [] | 18 flex | [] [] [] | 8 gas | [] | 3 gawk | [] [] | 5 gcal | [] [] | 4 gcc | [] | 3 gettext | [] [] [] [] | 10 gnupg | [] [] [] | 12 gprof | [] [] | 4 grep | [] [] [] | 10 hello | [] [] [] [] [] [] [] | 25 id-utils | [] [] | 6 indent | [] [] [] [] | 12 jpilot | () () | 3 jwhois | () () [] | 3 kbd | [] [] | 4 ld | [] [] | 4 libc | [] [] [] [] [] [] | 17 lilypond | [] | 5 lynx | [] [] [] | 9 m4 | [] [] [] | 12 make | [] [] [] [] | 12 mysecretdiary | [] [] | 4 nano | () [] [] [] [] | 14 nano_1_0 | () [] [] [] | 13 opcodes | [] [] | 6 parted | [] [] [] | 10 ptx | [] [] [] [] [] [] | 15 python | | 0 recode | [] [] [] [] | 13 sed | [] [] [] [] [] [] | 21 sh-utils | [] [] [] [] [] [] [] [] [] | 22 sharutils | [] [] [] | 12 sketch | [] () | 3 soundtracker | [] | 5 sp | | 0 tar | [] [] [] [] [] [] [] | 16 texinfo | [] [] [] | 10 textutils | [] [] [] [] | 11 util-linux | [] [] [] | 8 vorbis-tools | [] | 1 wdiff | [] [] [] [] | 9 wget | [] [] [] [] [] [] [] | 20 +----------------------------------------+ 35 teams no pl pt pt_BR ru sk sl sv tr uk zh_TW 55 domains 5 13 2 12 25 11 11 41 34 4 7 489 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are used for implementing regional variants of languages, or language dialects. For a PO file in the matrix above to be effective, the package to which it applies should also have been internationalized and distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. If March 2002 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. Using `gettext' in new packages =============================== If you are writing a freely available program and want to internationalize it you are welcome to use GNU `gettext' in your package. Of course you have to respect the GNU Library General Public License which covers the use of the GNU `gettext' library. This means in particular that even non-free programs can use `libintl' as a shared library, whereas only free software can use `libintl' as a static library or use modified versions of `libintl'. Once the sources are changed appropriately and the setup can handle to use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact `tra...@ir...' to make the `.pot' files available to the translation teams. --- NEW FILE: COPYING --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) 19yy <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. --- NEW FILE: INSTALL --- Basic Installation ================== These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that you can run in the future to recreate the current configuration, a file `config.cache' that saves the results of its tests to speed up reconfiguring, and a file `config.log' containing compiler output (useful mainly for debugging `configure'). If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can be considered for the next release. If at some point `config.cache' contains results you don't want to keep, you may remove or edit it. The file `configure.in' is used to create `configure' by a program called `autoconf'. You only need `configure.in' if you want to change it or regenerate `configure' using a newer version of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. If you're using `csh' on an old version of System V, you might need to type `sh ./configure' instead to prevent `csh' from trying to execute `configure' itself. Running `configure' takes awhile. While running, it prints some messages telling which features it is checking for. 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with the package. 4. Type `make install' to install the programs and any data files and documentation. 5. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is also a `make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. Compilers and Options ===================== Some systems require unusual options for compilation or linking that the `configure' script does not know about. You can give `configure' initial values for variables by setting them in the environment. Using a Bourne-compatible shell, you can do that on the command line like this: CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure Or on systems that have the `env' program, you can do it like this: env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure Compiling For Multiple Architectures ==================================== You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. If you have to use a `make' that does not supports the `VPATH' variable, you have to compile the package for one architecture at a time in the source code directory. After you have installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. Installation Names ================== By default, `make install' will install the package's files in `/usr/local/bin', `/usr/local/man', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PATH'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you give `configure' the option `--exec-prefix=PATH', the package will use PATH as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give options like `--bindir=PATH' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. Optional Features ================= Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The `README' should mention any `--enable-' and `--with-' options that the package recognizes. For packages that use the X Window System, `configure' can usually find the X include and library files automatically, but if it doesn't, you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. Specifying the System Type ========================== There may be some features `configure' can not figure out automatically, but needs to determine by the type of host the package will run on. Usually `configure' can figure that out, but if it prints a message saying it can not guess the host type, give it the `--host=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name with three fields: CPU-COMPANY-SYSTEM See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't need to know the host type. If you are building compiler tools for cross-compiling, you can also use the `--target=TYPE' option to select the type of system they will produce code for and the `--build=TYPE' option to select the type of system on which you are compiling the package. Sharing Defaults ================ If you want to set default values for `configure' scripts to share, you can create a site shell script called `config.site' that gives default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. Operation Controls ================== `configure' recognizes the following options to control how it operates. `--cache-file=FILE' Use and save the results of the tests in FILE instead of `./config.cache'. Set FILE to `/dev/null' to disable caching, for debugging `configure'. `--help' Print a summary of the options to `configure', and exit. `--quiet' `--silent' `-q' Do not print messages saying which checks are being made. To suppress all normal output, redirect it to `/dev/null' (any error messages will still be shown). `--srcdir=DIR' Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. `--version' Print the version of Autoconf used to generate the `configure' script, and exit. `configure' also accepts some other, not widely useful, options. --- NEW FILE: mkinstalldirs --- #! /bin/sh # mkinstalldirs --- make directory hierarchy # Author: Noah Friedman <fri...@pr...> # Created: 1993-05-16 # Public domain # $Id: mkinstalldirs,v 1.1 2003/01/06 06:04:54 conrad_c Exp $ errstatus=0 for file do set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift pathcomp= for d do pathcomp="$pathcomp$d" case "$pathcomp" in -* ) pathcomp=./$pathcomp ;; esac if test ! -d "$pathcomp"; then echo "mkdir $pathcomp" mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then errstatus=$lasterr fi fi pathcomp="$pathcomp/" done done exit $errstatus # mkinstalldirs ends here Index: configure.in =================================================================== RCS file: /cvsroot/gnupos/quick-gui/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.in 30 Dec 2002 13:56:07 -0000 1.2 --- configure.in 6 Jan 2003 06:04:54 -0000 1.3 *************** *** 2,6 **** AC_INIT(configure.in) ! AM_INIT_AUTOMAKE(gnupos, 0.1) AM_CONFIG_HEADER(config.h) --- 2,6 ---- AC_INIT(configure.in) ! AM_INIT_AUTOMAKE(quick-gui, 0.2) AM_CONFIG_HEADER(config.h) |
From: <con...@us...> - 2003-01-06 03:34:01
|
Update of /cvsroot/gnupos/text-gui/src/.libs In directory sc8-pr-cvs1:/tmp/cvs-serv21546/.libs Removed Files: libtext_gui.lai Log Message: Remove unnecessary files. --- libtext_gui.lai DELETED --- |
From: <con...@us...> - 2003-01-06 03:34:01
|
Update of /cvsroot/gnupos/text-gui/src/.deps In directory sc8-pr-cvs1:/tmp/cvs-serv21546/.deps Removed Files: main.P Log Message: Remove unnecessary files. --- main.P DELETED --- |
From: <con...@us...> - 2003-01-06 03:22:06
|
Update of /cvsroot/gnupos/text-gui/src In directory sc8-pr-cvs1:/tmp/cvs-serv18506 Removed Files: libtext_gui.la main.lo Log Message: Remove unnecessary files. --- libtext_gui.la DELETED --- --- main.lo DELETED --- |
From: <con...@us...> - 2003-01-06 03:18:43
|
Update of /cvsroot/gnupos/text-gui/src In directory sc8-pr-cvs1:/tmp/cvs-serv17777/src Removed Files: Makefile Makefile.in Log Message: Remove generated files. --- Makefile DELETED --- --- Makefile.in DELETED --- |
Update of /cvsroot/gnupos/text-gui In directory sc8-pr-cvs1:/tmp/cvs-serv17777 Removed Files: Makefile Makefile.in config.cache config.log config.status configure libtext_gui.so.0.0.0 Log Message: Remove generated files. --- Makefile DELETED --- --- Makefile.in DELETED --- --- config.cache DELETED --- --- config.log DELETED --- --- config.status DELETED --- --- configure DELETED --- --- libtext_gui.so.0.0.0 DELETED --- |
From: <con...@us...> - 2003-01-05 14:05:03
|
Update of /cvsroot/gnupos/gnupos/src In directory sc8-pr-cvs1:/tmp/cvs-serv31800/src Modified Files: GnuPOS-xml-P.h GnuPOSGSPLguile.c GnuPOSprocessing.c GnuPOSregisters.c Log Message: Works now with the text-gui interface. Index: GnuPOS-xml-P.h =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOS-xml-P.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GnuPOS-xml-P.h 4 Jan 2003 14:01:54 -0000 1.11 --- GnuPOS-xml-P.h 5 Jan 2003 14:04:54 -0000 1.12 *************** *** 102,103 **** --- 102,104 ---- registers_struct *gnp_get_register (guint); void gnp_dump_stuff (guint); + void gnp_execute_callback (registers_struct *); Index: GnuPOSGSPLguile.c =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOSGSPLguile.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GnuPOSGSPLguile.c 25 Dec 2002 14:34:45 -0000 1.7 --- GnuPOSGSPLguile.c 5 Jan 2003 14:04:54 -0000 1.8 *************** *** 108,113 **** if (gnp_global_data.program_debug) ! printf ("GUILE: Executing \"add\" command on register index %s and %s\n", ! param1, param2); if (SCM_STRINGP (param1) && SCM_STRINGP (param2)) --- 108,112 ---- if (gnp_global_data.program_debug) ! printf ("GUILE: Executing \"add\" command.\n"); if (SCM_STRINGP (param1) && SCM_STRINGP (param2)) *************** *** 119,136 **** switch (gnp_get_register_value_type (reg1)) { case GNP_VALUE_INTEGER: ! case GNP_VALUE_UNDEF: gnp_set_register_as_integer (ret, gnp_get_register_as_integer (reg1) + gnp_get_register_as_integer (reg2), TRUE); /* Must be TRUE so it can change RETURN */ break; case GNP_VALUE_STRING: strvalue = (gchar *) g_malloc (strlen (gnp_get_register_as_string (reg1)) + strlen (gnp_get_register_as_string (reg2))); strcpy (strvalue, gnp_get_register_as_string (reg1)); strcat (strvalue, gnp_get_register_as_string (reg2)); gnp_set_register_as_string (ret, strvalue, TRUE); break; --- 118,160 ---- switch (gnp_get_register_value_type (reg1)) { + /* The GNP_VALUE_UNDEF case is a special case - this is an undefined */ + /* register, and therefore this works as a 'copy' command. */ + case GNP_VALUE_UNDEF: + if(gnp_debug) + printf(" Destination register UNDEF. Using Copy command.\n"); + + gnp_duplicate_func_guile(param1, param2); + break; + case GNP_VALUE_INTEGER: ! if (gnp_debug) ! printf(" Setting register as integers.\n"); ! gnp_set_register_as_integer (ret, gnp_get_register_as_integer (reg1) + gnp_get_register_as_integer (reg2), TRUE); /* Must be TRUE so it can change RETURN */ break; case GNP_VALUE_STRING: + if (gnp_debug) + printf(" Allocating memory for new string.\n"); strvalue = (gchar *) g_malloc (strlen (gnp_get_register_as_string (reg1)) + strlen (gnp_get_register_as_string (reg2))); + /* FIXME: Add error checking here */ + + if (gnp_debug) + printf(" Concatinating string\n"); + strcpy (strvalue, gnp_get_register_as_string (reg1)); strcat (strvalue, gnp_get_register_as_string (reg2)); + if (gnp_debug) + printf(" Setting return register.\n"); + gnp_set_register_as_string (ret, strvalue, TRUE); + + if (gnp_debug) + printf(" Return Register set.\n"); + break; *************** *** 162,166 **** } ! return SCM_EOL; } --- 186,190 ---- } ! return SCM_BOOL_T; } *************** *** 183,188 **** switch (gnp_get_register_value_type (reg1)) { case GNP_VALUE_INTEGER: - case GNP_VALUE_UNDEF: gnp_set_register_as_integer (ret, gnp_get_register_as_integer (reg1) - gnp_get_register_as_integer (reg2), TRUE); /* Must be TRUE so it can change RETURN */ break; --- 207,220 ---- switch (gnp_get_register_value_type (reg1)) { + /* The GNP_VALUE_UNDEF case is a special case - this is an undefined */ + /* register, and therefore this works as a 'copy' command. */ + case GNP_VALUE_UNDEF: + if(gnp_debug) + printf(" Destination register UNDEF. Using Copy command.\n"); + + gnp_duplicate_func_guile(param1, param2); + break; + case GNP_VALUE_INTEGER: gnp_set_register_as_integer (ret, gnp_get_register_as_integer (reg1) - gnp_get_register_as_integer (reg2), TRUE); /* Must be TRUE so it can change RETURN */ break; *************** *** 254,259 **** switch (gnp_get_register_value_type (reg1)) { case GNP_VALUE_INTEGER: - case GNP_VALUE_UNDEF: gnp_set_register_as_integer (ret, gnp_get_register_as_integer (reg1) * gnp_get_register_as_integer (reg2), TRUE); /* Must be TRUE so it can change RETURN */ break; --- 286,299 ---- switch (gnp_get_register_value_type (reg1)) { + /* The GNP_VALUE_UNDEF case is a special case - this is an undefined */ + /* register, and therefore this works as a 'copy' command. */ + case GNP_VALUE_UNDEF: + if(gnp_debug) + printf(" Destination register UNDEF. Using Copy command.\n"); + + gnp_duplicate_func_guile(param1, param2); + break; + case GNP_VALUE_INTEGER: gnp_set_register_as_integer (ret, gnp_get_register_as_integer (reg1) * gnp_get_register_as_integer (reg2), TRUE); /* Must be TRUE so it can change RETURN */ break; *************** *** 315,320 **** switch (gnp_get_register_value_type (reg1)) { case GNP_VALUE_INTEGER: - case GNP_VALUE_UNDEF: gnp_set_register_as_integer (ret, gnp_get_register_as_integer (reg1) / gnp_get_register_as_integer (reg2), TRUE); /* Must be TRUE so it can change RETURN */ break; --- 355,368 ---- switch (gnp_get_register_value_type (reg1)) { + /* The GNP_VALUE_UNDEF case is a special case - this is an undefined */ + /* register, and therefore this works as a 'copy' command. */ + case GNP_VALUE_UNDEF: + if(gnp_debug) + printf(" Destination register UNDEF. Using Copy command.\n"); + + gnp_duplicate_func_guile(param1, param2); + break; + case GNP_VALUE_INTEGER: gnp_set_register_as_integer (ret, gnp_get_register_as_integer (reg1) / gnp_get_register_as_integer (reg2), TRUE); /* Must be TRUE so it can change RETURN */ break; *************** *** 373,377 **** { if (gnp_global_data.program_debug) ! printf ("GUILE: Executing \"set\" command.\n"); if (SCM_STRINGP (param1) && SCM_STRINGP (param2)) --- 421,425 ---- { if (gnp_global_data.program_debug) ! printf ("GUILE: Executing \"duplicate\" command.\n"); if (SCM_STRINGP (param1) && SCM_STRINGP (param2)) *************** *** 380,384 **** else { ! printf ("GUILE: value passed to \"gnp:set\" was not a string!\n"); return SCM_UNDEFINED; } --- 428,432 ---- else { ! printf ("GUILE: value passed to \"gnp:duplicate\" was not a string!\n"); return SCM_UNDEFINED; } Index: GnuPOSprocessing.c =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOSprocessing.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GnuPOSprocessing.c 4 Jan 2003 14:01:54 -0000 1.10 --- GnuPOSprocessing.c 5 Jan 2003 14:04:54 -0000 1.11 *************** *** 379,390 **** gnp_execute_input (state_input_struct * stateinput) { ! gchar *do_me; if (gnp_debug) printf ("In gnp_execute_input()\n"); ! do_me = stateinput->command; ! ! scm_eval_string (do_me); gnp_change_state (stateinput->endstate); --- 379,392 ---- gnp_execute_input (state_input_struct * stateinput) { ! SCM lsym; if (gnp_debug) + { printf ("In gnp_execute_input()\n"); + printf (" Command:\"%s\".\n",stateinput->command); + printf (" Input: %d, Endstate: %d.\n",stateinput->inpchar, stateinput->endstate); + } ! gh_eval_str (stateinput->command); gnp_change_state (stateinput->endstate); Index: GnuPOSregisters.c =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOSregisters.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** GnuPOSregisters.c 4 Jan 2003 14:01:55 -0000 1.15 --- GnuPOSregisters.c 5 Jan 2003 14:04:54 -0000 1.16 *************** *** 105,109 **** } /* if we get here, we have an undefined code */ ! /* we return 0xffffff to flag this */ return NULL; } --- 105,109 ---- } /* if we get here, we have an undefined code */ ! /* we return NULL to flag this */ return NULL; } *************** *** 219,228 **** /* If the register is a list type, the value type */ /* of the first element is returned. */ - /* If teh register is a display register, we will */ - /* force the type to "GNP_VALUE_STRING", even if it */ - /* currently contains nothing. */ { ! if (reg->type && GNP_REGISTER_DISPLAY) ! return GNP_VALUE_STRING; if (reg->value == NULL) return GNP_VALUE_UNDEF; --- 219,226 ---- /* If the register is a list type, the value type */ /* of the first element is returned. */ { ! if(gnp_debug) ! printf(" In gnp_get_register_value_type()\n"); ! if (reg->value == NULL) return GNP_VALUE_UNDEF; *************** *** 434,442 **** gnp_set_register_value_as_int (reg->value, value); if (gnp_debug) printf (" gnp_set_register_as_integer: Returns: TRUE\n"); - /* FIXME: Add calllback stuff here */ - return TRUE; } --- 432,440 ---- gnp_set_register_value_as_int (reg->value, value); + gnp_execute_callback(reg); + if (gnp_debug) printf (" gnp_set_register_as_integer: Returns: TRUE\n"); return TRUE; } *************** *** 506,514 **** gnp_set_register_value_as_string (reg->value, value); if (gnp_debug) printf (" gnp_set_register_as_string: Returns: TRUE\n"); - /* FIXME: Add calllback stuff here */ - return TRUE; } --- 504,512 ---- gnp_set_register_value_as_string (reg->value, value); + gnp_execute_callback(reg); + if (gnp_debug) printf (" gnp_set_register_as_string: Returns: TRUE\n"); return TRUE; } *************** *** 575,595 **** if (reg->value == NULL) reg->value = gnp_initialise_register_value (NULL); if (reg->type & GNP_REGISTER_DISPLAY) { gchar *temp; ! temp = (gchar *) g_malloc (sizeof (gchar) * 20); ! sprintf(temp,"%50.40f",gnc_numeric_to_double(*value)); gnp_set_register_value_as_string (reg->value, temp); } else gnp_set_register_value_as_gncnum(reg->value, value); if (gnp_debug) printf (" gnp_set_register_as_gncnum: Returns: TRUE\n"); - - /* FIXME: Add calllback stuff here */ - return TRUE; } --- 573,601 ---- if (reg->value == NULL) reg->value = gnp_initialise_register_value (NULL); + if (reg->type & GNP_REGISTER_DISPLAY) { gchar *temp; ! if(gnp_debug) ! printf(" Display register - setting as string.\n"); ! ! temp = (gchar *) g_malloc (sizeof (gchar) * 20); ! sprintf(temp,"%5.4f",gnc_numeric_to_double(*value)); gnp_set_register_value_as_string (reg->value, temp); } else + { + if(gnp_debug) + printf(" Setting register as gncnum.\n"); + gnp_set_register_value_as_gncnum(reg->value, value); + } + + gnp_execute_callback(reg); if (gnp_debug) printf (" gnp_set_register_as_gncnum: Returns: TRUE\n"); return TRUE; } *************** *** 650,656 **** if (retval) ! { ! /* FIXME: Add calllback stuff here */ ! } return retval; --- 656,660 ---- if (retval) ! gnp_execute_callback(reg); return retval; *************** *** 667,670 **** --- 671,675 ---- { gboolean retval; + gboolean do_callback = TRUE; if (gnp_debug) *************** *** 674,678 **** || reg->initial_value == NULL || gnp_get_register_value_type (reg) == GNP_REGISTER_UNDEF) ! retval = FALSE; else { --- 679,686 ---- || reg->initial_value == NULL || gnp_get_register_value_type (reg) == GNP_REGISTER_UNDEF) ! { ! retval = gnp_set_register_zero(reg); ! do_callback = FALSE; ! } else { *************** *** 690,697 **** } ! if (retval) ! { ! /* FIXME: Add calllback stuff here */ ! } return retval; --- 698,703 ---- } ! if (do_callback) ! gnp_execute_callback(reg); return retval; *************** *** 804,808 **** if (gnp_debug) ! printf ("In gnp_get_register_as_int_r()\n"); switch (gnp_get_register_value_type (reg)) --- 810,814 ---- if (gnp_debug) ! printf ("In gnp_get_register_as_integer()\n"); switch (gnp_get_register_value_type (reg)) *************** *** 845,851 **** { gchar *ret; if (gnp_debug) ! printf ("In gnp_get_register_as_string_r()\n"); switch (gnp_get_register_value_type (reg)) --- 851,858 ---- { gchar *ret; + guint size; if (gnp_debug) ! printf ("In gnp_get_register_as_string()\n"); switch (gnp_get_register_value_type (reg)) *************** *** 860,873 **** case GNP_VALUE_INTEGER: ! ret = (gchar *) g_malloc (sizeof (gchar) * 20); sprintf (ret, "%d", *reg->value->value.integer); break; case GNP_VALUE_STRING: ret = ! (gchar *) g_malloc (sizeof (gchar) * strlen (reg->value->value.string) + ! 1); ! strncpy (ret, reg->value->value.string, strlen (reg->value->value.string)); ! ret[strlen (reg->value->value.string)] = '\0'; break; --- 867,888 ---- case GNP_VALUE_INTEGER: ! if (gnp_debug) ! printf(" - get: Integer type.\n"); ! ! size = 20; ! ret = (gchar *) g_malloc (sizeof(gchar)*size); ! /* FIXME: Add error checking here */ sprintf (ret, "%d", *reg->value->value.integer); break; case GNP_VALUE_STRING: + if(gnp_debug) + printf(" - get: String type.\n"); + + size = strlen (reg->value->value.string); ret = ! (gchar *) g_malloc (sizeof (gchar) * size+1); ! strncpy (ret, reg->value->value.string, size); ! ret[size] = '\0'; break; *************** *** 923,927 **** case GNP_VALUE_STRING: if (gnp_debug) ! printf (" gncnum_r: GNP_VALUE_STRING (%s)\n", reg->value->value.string); if (strchr (reg->value->value.string, '/') != NULL) { --- 938,942 ---- case GNP_VALUE_STRING: if (gnp_debug) ! printf (" gncnum: GNP_VALUE_STRING (%s)\n", reg->value->value.string); if (strchr (reg->value->value.string, '/') != NULL) { *************** *** 935,940 **** temp = strtod (reg->value->value.string, &tail); if (gnp_debug) ! printf (" gncnum_r: double value: %f\n", temp); ! if (!strncmp (reg->value->value.string, tail, strlen (tail))) { /* String is not a number so we return 0 */ --- 950,955 ---- temp = strtod (reg->value->value.string, &tail); if (gnp_debug) ! printf (" gncnum: double value: %f\n", temp); ! if (!strcmp (reg->value->value.string, tail)) { /* String is not a number so we return 0 */ *************** *** 1005,1007 **** --- 1020,1055 ---- printf (" Matched register \"%s\".\n", register_table[i].sym); return ®ister_table[i]; + } + + void + gnp_execute_callback(registers_struct *reg) + { + + if(gnp_debug) + printf("In gnp_execute_callback\n"); + + if(reg->sub==NULL) + return; + + if(reg->optional == NULL) + { + if(!reg->typed) + /* No optional params or typed marker */ + reg->sub(reg->value->value.string); + else + /* No optional param but do have typed marker */ + reg->sub(reg->value->value.string,reg->value->value_type); + } + else + { + if(!reg->typed) + /* Optional param but no typed marker */ + reg->sub(reg->value->value.string,reg->optional); + else + /* Optional param and do have typed marker */ + reg->sub(reg->value->value.string,reg->optional,reg->value->value_type); + } + + if(gnp_debug) + printf(" Returning from callback\n"); } |
From: <con...@us...> - 2003-01-05 14:05:03
|
Update of /cvsroot/gnupos/gnupos In directory sc8-pr-cvs1:/tmp/cvs-serv31800 Modified Files: samplekeymap.xml stateslib.xml Log Message: Works now with the text-gui interface. Index: samplekeymap.xml =================================================================== RCS file: /cvsroot/gnupos/gnupos/samplekeymap.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** samplekeymap.xml 4 Jan 2003 14:01:54 -0000 1.3 --- samplekeymap.xml 5 Jan 2003 14:04:54 -0000 1.4 *************** *** 23,35 **** <gnp:setstate name="Clear"> <gnp:input key="%decimal"> ! <gnp:perform>set(inputstring,key).set(display,inputstring)</gnp:perform> <gnp:endstate>numeric</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>quit</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>clear(inputstring)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> --- 23,35 ---- <gnp:setstate name="Clear"> <gnp:input key="%decimal"> ! <gnp:perform>(gnp:add "inputstring" "key")(gnp:add "display" "key")</gnp:perform> <gnp:endstate>numeric</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>((gnp:quit))</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> Index: stateslib.xml =================================================================== RCS file: /cvsroot/gnupos/gnupos/stateslib.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stateslib.xml 29 Dec 2002 15:00:34 -0000 1.2 --- stateslib.xml 5 Jan 2003 14:04:54 -0000 1.3 *************** *** 13,41 **** <gnp:setstate name="numeric"> <gnp:input key="%decimal"> ! <gnp:perform>add(inputstring,key).set(inputstring,return).set(display,inputstring)</gnp:perform> <gnp:endstate>numeric</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>quit</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>clear(inputstring)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="plus"> ! <gnp:perform>gncnum(inputstring).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="minus"> ! <gnp:perform>gncnum(inputstring).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="asterisk"> ! <gnp:perform>gncnum(inputstring).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="slash"> ! <gnp:perform>gncnum(inputstring).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> --- 13,41 ---- <gnp:setstate name="numeric"> <gnp:input key="%decimal"> ! <gnp:perform>(gnp:add "inputstring" "key")(gnp:duplicate "inputstring" "return")(gnp:duplicate "display" "inputstring")</gnp:perform> <gnp:endstate>numeric</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>(gnp:quit)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="plus"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="minus"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="asterisk"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="slash"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> *************** *** 49,81 **** <gnp:setstate name="plus"> <gnp:input key="%decimal"> ! <gnp:perform>add(inputstring,key).set(inputstring,return).set(display,inputstring)</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>clear(grandtotal).set(display,grandtotal)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>quit</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="plus"> ! <gnp:perform>.gncnum(inputstring).add(return,grandtotal).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="minus"> ! <gnp:perform>.gncnum(inputstring).add(return,grandtotal).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="equal"> ! <gnp:perform>.gncnum(inputstring).add(return,grandtotal).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="asterisk"> ! <gnp:perform>.gncnum(inputstring).add(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="slash"> ! <gnp:perform>.gncnum(inputstring).add(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> --- 49,81 ---- <gnp:setstate name="plus"> <gnp:input key="%decimal"> ! <gnp:perform>(gnp:add "inputstring" "key")(gnp:duplicate "inputstring" "return")(gnp:duplicate "display" "inputstring")</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>(gnp:clear "grandtotal")(gnp:duplicate "display" "grandtotal")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>(gnp:quit)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="plus"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:add "return" "grandtotal")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="minus"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:add "return" "grandtotal")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="equal"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:add "return" "grandtotal")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="asterisk"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:add "return" "grandtotal")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="slash"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:add "return" "grandtotal")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> *************** *** 89,121 **** <gnp:setstate name="minus"> <gnp:input key="%decimal"> ! <gnp:perform>add(inputstring,key).set(inputstring,return).set(display,inputstring)</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>clear(grandtotal).set(display,grandtotal)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>quit</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="plus"> ! <gnp:perform>gncnum(inputstring).subtract(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="minus"> ! <gnp:perform>gncnum(inputstring).subtract(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="equal"> ! <gnp:perform>gncnum(inputstring).subtract(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="asterisk"> ! <gnp:perform>gncnum(inputstring).subtract(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="slash"> ! <gnp:perform>gncnum(inputstring).subtract(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> --- 89,121 ---- <gnp:setstate name="minus"> <gnp:input key="%decimal"> ! <gnp:perform>(gnp:add "inputstring" "key")(gnp:duplicate "inputstring" "return")(gnp:duplicate "display" "inputstring")</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>(gnp:clear "grandtotal")(gnp:duplicate "display" "grandtotal")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>(gnp:quit)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="plus"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:subtract "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="minus"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:subtract "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="equal"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:subtract "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="asterisk"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:subtract "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="slash"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:subtract "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> *************** *** 129,161 **** <gnp:setstate name="multiply"> <gnp:input key="%decimal"> ! <gnp:perform>add(inputstring,key).set(inputstring,return).set(display,inputstring)</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>clear(grandtotal).set(display,grandtotal)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>quit</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="plus"> ! <gnp:perform>gncnum(inputstring).multiply(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="minus"> ! <gnp:perform>gncnum(inputstring).multiply(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="equal"> ! <gnp:perform>gncnum(inputstring).multiply(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="asterisk"> ! <gnp:perform>.gncnum(inputstring).multiply(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="slash"> ! <gnp:perform>.gncnum(inputstring).multiply(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> --- 129,161 ---- <gnp:setstate name="multiply"> <gnp:input key="%decimal"> ! <gnp:perform>(gnp:add "inputstring" "key")(gnp:duplicate "inputstring" "return")(gnp:duplicate "display" "inputstring")</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>(gnp:clear "grandtotal")(gnp:duplicate "display" "grandtotal")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>(gnp:quit)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="plus"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:multiply "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="minus"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:multiply "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="equal"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:multiply "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="asterisk"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:multiply "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="slash"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:multiply "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> *************** *** 169,201 **** <gnp:setstate name="divide"> <gnp:input key="%decimal"> ! <gnp:perform>add(inputstring,key).set(inputstring,return).set(display,inputstring)</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>clear(grandtotal).set(display,grandtotal)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>quit</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="plus"> ! <gnp:perform>.gncnum(inputstring).divide(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="minus"> ! <gnp:perform>.gncnum(inputstring).divide(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="equal"> ! <gnp:perform>.gncnum(inputstring).divide(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="asterisk"> ! <gnp:perform>.gncnum(inputstring).divide(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="slash"> ! <gnp:perform>.gncnum(inputstring).divide(grandtotal,return).set(grandtotal,return).set(display,grandtotal).clear(inputstring)</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> --- 169,201 ---- <gnp:setstate name="divide"> <gnp:input key="%decimal"> ! <gnp:perform>(gnp:add "inputstring" "key")(gnp:duplicate "inputstring" "return")(gnp:duplicate "display" "inputstring")</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> <gnp:input key="F12"> ! <gnp:perform>(gnp:clear "grandtotal")(gnp:duplicate "display" "grandtotal")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="Escape"> ! <gnp:perform>(gnp:quit)</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="plus"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:divide "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>plus</gnp:endstate> </gnp:input> <gnp:input key="minus"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:divide "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>minus</gnp:endstate> </gnp:input> <gnp:input key="equal"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:divide "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>Clear</gnp:endstate> </gnp:input> <gnp:input key="asterisk"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:divide "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>multiply</gnp:endstate> </gnp:input> <gnp:input key="slash"> ! <gnp:perform>(gnp:gncnum "inputstring")(gnp:divide "grandtotal" "return")(gnp:duplicate "grandtotal" "return")(gnp:duplicate "display" "grandtotal")(gnp:clear "inputstring")</gnp:perform> <gnp:endstate>divide</gnp:endstate> </gnp:input> |
From: <con...@us...> - 2003-01-04 14:09:58
|
Update of /cvsroot/gnupos/gnupos/src In directory sc8-pr-cvs1:/tmp/cvs-serv29506/src Modified Files: GnuPOSxml.c Log Message: That was so obvious it should have had a flashing neon sign. Now theoretically runs provided a valid statefile is given. Don\'t have a valid statefile (yet) to test this theory. Index: GnuPOSxml.c =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOSxml.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GnuPOSxml.c 4 Jan 2003 14:01:55 -0000 1.16 --- GnuPOSxml.c 4 Jan 2003 14:09:55 -0000 1.17 *************** *** 1221,1226 **** else if (!strcmp (type, (const char *) "dynamic")) { - int x; - if(gnp_debug) printf(" Determined library to be of external type.\n"); --- 1221,1224 ---- *************** *** 1229,1236 **** { if(gnp_debug) ! printf(" Setting handle %x for %s.\n",myhandle, top->name); ! current->library_path = path; if(top!=current) ! top = current->next; else top=NULL; --- 1227,1234 ---- { if(gnp_debug) ! printf(" Setting path %s for %s.\n",path, top->name); ! top->library_path = path; if(top!=current) ! top = top->next; else top=NULL; |
From: <con...@us...> - 2003-01-04 14:01:57
|
Update of /cvsroot/gnupos/gnupos/src In directory sc8-pr-cvs1:/tmp/cvs-serv27048/src Modified Files: GnuPOS-xml-P.h GnuPOS.h GnuPOSprocessing.c GnuPOSregisters.c GnuPOSxml.c main.c Log Message: More work. Compiles, just chasing segfaults. Index: GnuPOS-xml-P.h =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOS-xml-P.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GnuPOS-xml-P.h 1 Jan 2003 14:09:53 -0000 1.10 --- GnuPOS-xml-P.h 4 Jan 2003 14:01:54 -0000 1.11 *************** *** 67,71 **** gboolean gnp_parse_state (xmlDocPtr, xmlNodePtr, guint); gboolean gnp_parse_library (statefile_struct *, xmlNodePtr, ! guint *); gboolean gnp_parse_register (statefile_struct *, guint *, xmlNodePtr); --- 67,71 ---- gboolean gnp_parse_state (xmlDocPtr, xmlNodePtr, guint); gboolean gnp_parse_library (statefile_struct *, xmlNodePtr, ! guint *, gchar *); gboolean gnp_parse_register (statefile_struct *, guint *, xmlNodePtr); Index: GnuPOS.h =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOS.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GnuPOS.h 25 Dec 2002 14:34:45 -0000 1.7 --- GnuPOS.h 4 Jan 2003 14:01:54 -0000 1.8 *************** *** 18,22 **** char *script_version; char *station_id; ! } gnp_global_data_struct; --- 18,24 ---- char *script_version; char *station_id; ! char *ui_event; ! char *ui_name; ! void (*ui_event_ptr)(); } gnp_global_data_struct; Index: GnuPOSprocessing.c =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOSprocessing.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GnuPOSprocessing.c 25 Dec 2002 14:34:45 -0000 1.9 --- GnuPOSprocessing.c 4 Jan 2003 14:01:54 -0000 1.10 *************** *** 434,439 **** { printf ("-------------------------------------------------------\n"); ! printf ("%d: %s -> %x: ", i, register_table[i].sym, ! register_table[i].code); if (register_table[i].initial_value != NULL) --- 434,438 ---- { printf ("-------------------------------------------------------\n"); ! printf ("%d: %s -> ", i, register_table[i].sym); if (register_table[i].initial_value != NULL) *************** *** 463,488 **** } } ! switch (gnp_get_register_value_type (®ister_table[i])) { ! case GNP_VALUE_INTEGER: ! printf ("current value (integer): %d ", ! *register_table[i].value->value.integer); ! break; ! case GNP_VALUE_UNDEF: ! printf ("current value undefined"); ! break; ! case GNP_VALUE_STRING: ! printf ("current value (string): \"%s\", ", ! register_table[i].value->value.string); ! break; ! case GNP_VALUE_GNCNUMERIC: ! printf ("current value (gncnum): \"%s\", ", ! gnc_numeric_to_string (*register_table[i].value->value.gncnum)); ! break; ! default: ! printf ("current value type undefined!: type %x ", ! register_table[i].value->value_type); ! break; } printf ("\n"); } --- 462,496 ---- } } ! else ! printf(" No initial value. "); ! ! if(register_table[i].value != NULL) { ! switch (gnp_get_register_value_type (®ister_table[i])) ! { ! case GNP_VALUE_INTEGER: ! printf ("current value (integer): %d ", ! *register_table[i].value->value.integer); ! break; ! case GNP_VALUE_UNDEF: ! printf ("current value undefined"); ! break; ! case GNP_VALUE_STRING: ! printf ("current value (string): \"%s\", ", ! register_table[i].value->value.string); ! break; ! case GNP_VALUE_GNCNUMERIC: ! printf ("current value (gncnum): \"%s\", ", ! gnc_numeric_to_string (*register_table[i].value->value.gncnum)); ! break; ! default: ! printf ("current value type undefined!: type %x ", ! register_table[i].value->value_type); ! break; ! } } + else + printf(" No current value."); + printf ("\n"); } Index: GnuPOSregisters.c =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOSregisters.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GnuPOSregisters.c 3 Jan 2003 01:25:16 -0000 1.14 --- GnuPOSregisters.c 4 Jan 2003 14:01:55 -0000 1.15 *************** *** 51,55 **** {"statustext", GNPR_STATUSTEXT, GNP_REGISTER_DISPLAY, NULL, NULL, NULL,NULL,FALSE}, {"receiptprn", GNPR_RECEIPTPRN, GNP_REGISTER_DISPLAY, NULL, NULL, NULL,NULL,FALSE}, ! {"custdisp", GNPR_CUSTDISPLY, GNP_REGISTER_DISPLAY, NULL, NULL, NULL,NULL,FALSE}, {"statestack", GNPR_STATESTACK, GNP_REGISTER_READONLY|GNP_REGISTER_LIST, NULL, NULL, NULL,NULL,FALSE} }; --- 51,55 ---- {"statustext", GNPR_STATUSTEXT, GNP_REGISTER_DISPLAY, NULL, NULL, NULL,NULL,FALSE}, {"receiptprn", GNPR_RECEIPTPRN, GNP_REGISTER_DISPLAY, NULL, NULL, NULL,NULL,FALSE}, ! {"custdisplay", GNPR_CUSTDISPLY, GNP_REGISTER_DISPLAY, NULL, NULL, NULL,NULL,FALSE}, {"statestack", GNPR_STATESTACK, GNP_REGISTER_READONLY|GNP_REGISTER_LIST, NULL, NULL, NULL,NULL,FALSE} }; *************** *** 157,181 **** register_table[register_current_count].typed = FALSE; ! loop = value; ! ! while(loop!=NULL) { ! rvs = (register_value_struct *)g_malloc(sizeof(register_value_struct)); ! if(rvs == NULL) ! { ! printf("ERROR: Out of memory building register value. ABORTING.\n"); ! exit(-1); ! } ! rvs->value = loop->value; ! rvs->value_type = loop->value_type; ! rvs->next = NULL; ! if(current == NULL) ! register_table[register_current_count].value = rvs; ! else ! current->next = rvs; ! current = rvs; ! loop = loop->next; } --- 157,186 ---- register_table[register_current_count].typed = FALSE; ! if(value==NULL) ! register_table[register_current_count].value = NULL; ! else { ! loop = value; ! while(loop!=NULL) ! { ! rvs = (register_value_struct *)g_malloc(sizeof(register_value_struct)); ! if(rvs == NULL) ! { ! printf("ERROR: Out of memory building register value. ABORTING.\n"); ! exit(-1); ! } ! rvs->value = loop->value; ! rvs->value_type = loop->value_type; ! rvs->next = NULL; ! if(current == NULL) ! register_table[register_current_count].value = rvs; ! else ! current->next = rvs; ! ! current = rvs; ! loop = loop->next; ! } } *************** *** 194,208 **** reg=gnp_lookup_register(reg_name); if(gnp_debug) printf(" Setting callbacks. sub: %p, param: %s, typed: %d\n",sub, parameter_string, typed); reg->sub = sub; - printf("1\n"); reg->optional = parameter_string; - printf("2\n"); if(typed == 0) reg->typed = FALSE; else reg->typed = TRUE; - printf("3\n"); } --- 199,214 ---- reg=gnp_lookup_register(reg_name); + if(reg==NULL) + printf(" Register \"%s\" not found. ABORTING.\n"); + if(gnp_debug) printf(" Setting callbacks. sub: %p, param: %s, typed: %d\n",sub, parameter_string, typed); + reg->sub = sub; reg->optional = parameter_string; if(typed == 0) reg->typed = FALSE; else reg->typed = TRUE; } Index: GnuPOSxml.c =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOSxml.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** GnuPOSxml.c 3 Jan 2003 01:25:16 -0000 1.15 --- GnuPOSxml.c 4 Jan 2003 14:01:55 -0000 1.16 *************** *** 310,313 **** --- 310,315 ---- gboolean ssfound = FALSE; /* found <startstate> tag */ gboolean server = FALSE; /* found <server> tag */ + gboolean ui = FALSE; /* found <userinterface> tag */ + gboolean uieventloop = FALSE; /* found <ui_event_loop> tag */ gboolean namefound = FALSE; /* found <script><name> tag */ gboolean idfound = FALSE; /* found <identifier> tag */ *************** *** 455,459 **** } } ! if (!upperallok) printf("WARNING: Tag <%s> not recognised. IGNORED.\n",innernode->name); innernode = innernode->next; --- 457,502 ---- } } ! if ((!xmlStrcmp (innernode->name, (const xmlChar *) "userinterface")) && ! (innernode->ns == sf->namespace)) ! { ! if(gnp_debug) ! printf("Reading userinterface name.\n"); ! ! if(ui) ! { ! printf("ERROR: Two <userinterface> tags supplied. ABORTING.\n"); ! exit(-1); ! } ! ui=TRUE; ! ! gnp_global_data.ui_name = ! xmlNodeListGetString (sf->document, innernode->xmlChildrenNode, 1); ! ! if (gnp_global_data.verbose_status) ! printf ("User interface %s.\n", gnp_global_data.ui_name); ! upperallok = TRUE; ! } ! if ((!xmlStrcmp (innernode->name, (const xmlChar *) "ui_event_loop")) && ! (innernode->ns == sf->namespace)) ! { ! if(gnp_debug) ! printf("Reading ui_event_loop.\n"); ! ! if(uieventloop) ! { ! printf("ERROR: Two <ui_event_loop> tags supplied. ABORTING.\n"); ! exit(-1); ! } ! uieventloop=TRUE; ! ! gnp_global_data.ui_event = ! xmlNodeListGetString (sf->document, innernode->xmlChildrenNode, 1); ! ! if (gnp_global_data.verbose_status) ! printf ("UI Event Loop loaded as %s.\n", gnp_global_data.ui_event); ! upperallok = TRUE; ! } ! ! if (!upperallok) printf("WARNING: Tag <%s> not recognised. IGNORED.\n",innernode->name); innernode = innernode->next; *************** *** 520,524 **** { /* parse library here */ ! gnp_parse_library (sf, innerstates->xmlChildrenNode, counters); } innerstates = innerstates->next; --- 563,567 ---- { /* parse library here */ ! gnp_parse_library (sf, innerstates->xmlChildrenNode, counters, xmlGetProp (innerstates, (const xmlChar *) "name")); } innerstates = innerstates->next; *************** *** 693,697 **** gboolean ! gnp_parse_library (statefile_struct * sf, xmlNodePtr node, guint counters[]) { xmlNodePtr moreinner; --- 736,740 ---- gboolean ! gnp_parse_library (statefile_struct * sf, xmlNodePtr node, guint counters[], gchar *libname) { xmlNodePtr moreinner; *************** *** 699,704 **** gchar *type = NULL; gchar *init_routine = NULL; - extern_func_struct *top = NULL; - extern_func_struct *current = NULL; guint param_count = 99999; gchar *name = NULL; --- 742,745 ---- *************** *** 707,713 **** gboolean validtopok = FALSE; void (*initialise)(); if(gnp_debug) ! printf("In gnp_parse_library.\n"); moreinner = node; --- 748,755 ---- gboolean validtopok = FALSE; void (*initialise)(); + extern_func_struct *top=NULL,*current=NULL; if(gnp_debug) ! printf("In gnp_parse_library, library name \"%s\".\n",libname); moreinner = node; *************** *** 834,838 **** guile_name = xmlNodeListGetString (sf->document, ! moreinner->xmlChildrenNode, 1); match = TRUE; --- 876,880 ---- guile_name = xmlNodeListGetString (sf->document, ! fnode->xmlChildrenNode, 1); match = TRUE; *************** *** 890,907 **** guile_name = name; ! if (current == NULL) { if(gnp_debug) printf(" Initialising External Function structure.\n"); ! top = g_malloc (sizeof (extern_func_struct)); ! if (top == NULL) { printf ("OUT OF MEMORY!\n"); exit (-1); } ! if(efs_top==NULL) ! efs_top=top; ! current = top; } else --- 932,948 ---- guile_name = name; ! if (efs_current == NULL) { if(gnp_debug) printf(" Initialising External Function structure.\n"); ! efs_top = g_malloc (sizeof (extern_func_struct)); ! if (efs_top == NULL) { printf ("OUT OF MEMORY!\n"); exit (-1); } ! efs_current = top; ! top=efs_current; } else *************** *** 910,930 **** printf(" Adding to External Function structure.\n"); ! current->next = g_malloc (sizeof (extern_func_struct)); ! if (current->next == NULL) { printf ("OUT OF MEMORY!\n"); exit (-1); } ! current = current->next; } ! current->name = name; ! current->other_name = guile_name; ! current->parameter_string = NULL; ! current->param_count = param_count; ! current->register_flag = 0; ! current->handle=NULL; ! current->next = NULL; ! efs_current=current; } --- 951,974 ---- printf(" Adding to External Function structure.\n"); ! efs_current->next = g_malloc (sizeof (extern_func_struct)); ! if (efs_current->next == NULL) { printf ("OUT OF MEMORY!\n"); exit (-1); } ! efs_current = efs_current->next; ! ! if(top==NULL) ! top=efs_current; } ! efs_current->name = name; ! efs_current->other_name = guile_name; ! efs_current->parameter_string = NULL; ! efs_current->param_count = param_count; ! efs_current->register_flag = 0; ! efs_current->handle=NULL; ! efs_current->next = NULL; ! current=efs_current; } *************** *** 1012,1029 **** exit(-1); } ! if (current == NULL) { if(gnp_debug) printf(" Initialising External Function structure.\n"); ! top = g_malloc (sizeof (extern_func_struct)); ! if (top == NULL) { printf ("OUT OF MEMORY!\n"); exit (-1); } ! if(efs_top==NULL) ! efs_top=top; ! current = top; } else --- 1056,1073 ---- exit(-1); } ! ! if (efs_current == NULL) { if(gnp_debug) printf(" Initialising External Function structure.\n"); ! efs_top = g_malloc (sizeof (extern_func_struct)); ! if (efs_top == NULL) { printf ("OUT OF MEMORY!\n"); exit (-1); } ! efs_current = efs_top; ! top=efs_top; } else *************** *** 1032,1052 **** printf(" Adding to External Function structure.\n"); ! current->next = g_malloc (sizeof (extern_func_struct)); ! if (current->next == NULL) { printf ("OUT OF MEMORY!\n"); exit (-1); } ! current = current->next; } ! current->name = expname; ! current->other_name = expreg; ! current->parameter_string = expparam; ! current->param_count = typed; ! current->register_flag = 1; ! current->handle=NULL; ! current->next = NULL; ! efs_current=current; validtopok = TRUE; --- 1076,1096 ---- printf(" Adding to External Function structure.\n"); ! efs_current->next = g_malloc (sizeof (extern_func_struct)); ! if (efs_current->next == NULL) { printf ("OUT OF MEMORY!\n"); exit (-1); } ! efs_current = efs_current->next; } ! efs_current->name = expname; ! efs_current->other_name = expreg; ! efs_current->parameter_string = expparam; ! efs_current->param_count = typed; ! efs_current->register_flag = 1; ! efs_current->handle=NULL; ! efs_current->next = NULL; ! current=efs_current; validtopok = TRUE; *************** *** 1064,1067 **** --- 1108,1199 ---- exit (-1); } + + if (init_routine!=NULL) + { + if(gnp_debug) + printf(" Setting Initialisation routine for library.\n"); + + if (efs_current == NULL) + { + if(gnp_debug) + printf(" Initialising External Function structure.\n"); + + efs_top = g_malloc (sizeof (extern_func_struct)); + if (efs_top == NULL) + { + printf ("OUT OF MEMORY!\n"); + exit (-1); + } + efs_current = efs_top; + top=efs_current; + } + else + { + if(gnp_debug) + printf(" Adding to External Function structure.\n"); + + efs_current->next = g_malloc (sizeof (extern_func_struct)); + if (efs_current->next == NULL) + { + printf ("OUT OF MEMORY!\n"); + exit (-1); + } + efs_current = efs_current->next; + } + + efs_current->name = init_routine; + efs_current->other_name = NULL; + efs_current->parameter_string = NULL; + efs_current->param_count = 0; + efs_current->register_flag = 2; + efs_current->handle=NULL; + efs_current->next = NULL; + current=efs_current; + } + + if ((libname!=NULL)&&(!strcmp(libname,gnp_global_data.ui_name))) + { + + if(gnp_debug) + printf(" Setting UI event loop.\n"); + + if (efs_current == NULL) + { + if(gnp_debug) + printf(" Initialising External Function structure.\n"); + + efs_top = g_malloc (sizeof (extern_func_struct)); + if (efs_top == NULL) + { + printf ("OUT OF MEMORY!\n"); + exit (-1); + } + efs_current = efs_top; + top=efs_current; + } + else + { + if(gnp_debug) + printf(" Adding to External Function structure.\n"); + + efs_current->next = g_malloc (sizeof (extern_func_struct)); + if (efs_current->next == NULL) + { + printf ("OUT OF MEMORY!\n"); + exit (-1); + } + efs_current = efs_current->next; + } + + efs_current->name = gnp_global_data.ui_event; + efs_current->other_name = NULL; + efs_current->parameter_string = NULL; + efs_current->param_count = 0; + efs_current->register_flag = 3; + efs_current->handle=NULL; + efs_current->next = NULL; + current=efs_current; + } + if ((type == NULL) || (!strcmp (type, (const char *) "internal"))) { *************** *** 1094,1133 **** printf(" Determined library to be of external type.\n"); ! /* Testing: Move this stuff to gnp_load_dynlibsyms() ! x = dlinit (); ! if (x != 0) ! { ! printf ("ERROR: dl_init() returns an error. ABORTING.\n"); ! exit (-1); ! } ! ! if(gnp_debug) ! printf(" Opening library %s\n",path); ! ! myhandle = dlopen (path,RTLD_LAZY); ! if(myhandle==NULL) ! { ! printf("ERROR: Library \"%s\" could not be opened. ABORTING.\n",path); ! exit(-1); ! } ! ! if(gnp_debug) ! printf(" Library opened, handle is %x.\n",myhandle); ! */ ! current = top; ! while (current != NULL) { if(gnp_debug) ! printf(" Setting handle %x for %s.\n",myhandle, current->name); ! current->handle=myhandle; current->library_path = path; ! current = current->next; } - /* - if(init_routine!=NULL) - { - initialise=lt_dlsym(myhandle,init_routine); - initialise(); - } */ } else --- 1226,1239 ---- printf(" Determined library to be of external type.\n"); ! while (top != NULL) { if(gnp_debug) ! printf(" Setting handle %x for %s.\n",myhandle, top->name); current->library_path = path; ! if(top!=current) ! top = current->next; ! else ! top=NULL; } } else *************** *** 1524,1528 **** { extern_func_struct *ecurrent; ! void *sub; typedef struct --- 1630,1634 ---- { extern_func_struct *ecurrent; ! void (*sub)(); typedef struct *************** *** 1541,1548 **** if(efs_top!=NULL) { ! /* if(gnp_debug) printf(" Initialising libltdl.\n"); ! x = lt_dlinit (); if (x != 0) { --- 1647,1654 ---- if(efs_top!=NULL) { ! if(gnp_debug) printf(" Initialising libltdl.\n"); ! /* x = lt_dlinit (); if (x != 0) { *************** *** 1585,1589 **** lstop=g_malloc(sizeof(libstruct)); ! /* FIXME: Put error checking here! */ lscurrent=lstop; } --- 1691,1699 ---- lstop=g_malloc(sizeof(libstruct)); ! if(lstop == NULL) ! { ! printf("ERROR: Out of memory!\n"); ! exit(-1); ! } lscurrent=lstop; } *************** *** 1594,1598 **** lscurrent->next=g_malloc(sizeof(libstruct)); ! /* FIXME: Put error checking here */ lscurrent=lscurrent->next; } --- 1704,1712 ---- lscurrent->next=g_malloc(sizeof(libstruct)); ! if(lscurrent->next == NULL) ! { ! printf("ERROR: Out of memory!\n"); ! exit(-1); ! } lscurrent=lscurrent->next; } *************** *** 1629,1659 **** } ! if(ecurrent->register_flag==0) { if(gnp_debug) printf(" - Function identified as a guile function called \"%s\".\n", ecurrent->other_name); /* This is a guile function */ scm_make_gsubr(ecurrent->other_name,ecurrent->param_count,0,0,sub); ! } ! else ! if(ecurrent->register_flag==1) ! { ! if(gnp_debug) ! printf(" - Function identified as a callback function called \"%s\".\n", ! ecurrent->other_name); /* This is a register callback */ ! gnp_add_register_callback(ecurrent->other_name, sub, ! ecurrent->parameter_string, ecurrent->param_count); ! if(gnp_debug) ! printf(" Function callback added.\n"); ! } ! else ! { ! printf("ERROR: Internal error - invalid value for register_flag! ABORTING.\n"); ! exit(-1); ! } if(gnp_debug) ! printf(" End processing for %s.\n"); ecurrent=ecurrent->next; } --- 1743,1799 ---- } ! switch(ecurrent->register_flag) { + case 0: if(gnp_debug) + { printf(" - Function identified as a guile function called \"%s\".\n", ecurrent->other_name); + printf(" Parameter count: %d. Subroutine pointer %p.\n", + ecurrent->param_count, sub); + } /* This is a guile function */ scm_make_gsubr(ecurrent->other_name,ecurrent->param_count,0,0,sub); ! break; ! ! case 1: ! if(gnp_debug) ! printf(" - Function identified as a callback function called \"%s\".\n", ! ecurrent->other_name); /* This is a register callback */ ! gnp_add_register_callback(ecurrent->other_name, sub, ! ecurrent->parameter_string, ecurrent->param_count); ! if(gnp_debug) ! printf(" Function callback added.\n"); ! break; ! ! case 2: ! /* This is a library initialisation routine */ ! /* WE call this straight away, we don't save it. */ ! ! if(gnp_debug) ! printf(" - Function identified as a library initialisation function.\n"); ! ! sub(); ! break; ! ! case 3: ! /* This is the UI event loop handler. We store this straight into the */ ! /* global data structure. */ ! ! if(gnp_debug) ! printf(" - Function identified as the UI event loop handler.\n"); ! ! gnp_global_data.ui_event_ptr = sub; ! break; ! ! default: ! printf("ERROR: Internal error - invalid value for register_flag! ABORTING.\n"); ! exit(-1); ! } ! if(gnp_debug) ! printf(" End processing for %s.\n",ecurrent->name); ! ecurrent=ecurrent->next; } Index: main.c =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** main.c 26 Dec 2002 12:50:43 -0000 1.8 --- main.c 4 Jan 2003 14:01:55 -0000 1.9 *************** *** 23,30 **** innermain (int argc, char **argv, void *closure) { gnp_initialise_guile (); ! /* Load the gui library here and call its execution loop */ } --- 23,42 ---- innermain (int argc, char **argv, void *closure) { + if (gnp_debug) + printf("Initialising internal data structures.\n"); + + gnp_initialise_tables (); + + if (gnp_debug) + printf("Initialising guile functions.\n"); + gnp_initialise_guile (); ! if (gnp_debug) ! printf("Starting event loop.\n"); ! ! gnp_global_data.ui_event_ptr(); + printf ("Thank you for using GnuPOS. Have a nice day.\n"); } *************** *** 102,107 **** } ! gnp_initialise_tables (); scm_boot_guile (argc, &argv, innermain, NULL); return (0); } --- 114,122 ---- } ! if (gnp_debug) ! printf("Booting guile.\n"); ! scm_boot_guile (argc, &argv, innermain, NULL); + return (0); } |
From: <con...@us...> - 2003-01-04 14:01:57
|
Update of /cvsroot/gnupos/gnupos In directory sc8-pr-cvs1:/tmp/cvs-serv27048 Modified Files: samplekeymap.xml Log Message: More work. Compiles, just chasing segfaults. Index: samplekeymap.xml =================================================================== RCS file: /cvsroot/gnupos/gnupos/samplekeymap.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** samplekeymap.xml 29 Dec 2002 15:00:33 -0000 1.2 --- samplekeymap.xml 4 Jan 2003 14:01:54 -0000 1.3 *************** *** 4,8 **** <gnp:startstate>Clear</gnp:startstate> <gnp:userinterface>text-gui</gnp:userinterface> ! <gnp:interface_init>main_event_loop</gnp:interface_init> </gnp:initialisation> <gnp:definitions> --- 4,8 ---- <gnp:startstate>Clear</gnp:startstate> <gnp:userinterface>text-gui</gnp:userinterface> ! <gnp:ui_event_loop>main_event_loop</gnp:ui_event_loop> </gnp:initialisation> <gnp:definitions> *************** *** 17,21 **** <gnp:register name="subtotal"> <gnp:mode>Normal</gnp:mode> ! <gnp:displayname>Grand Total</gnp:displayname> </gnp:register> </gnp:definitions> --- 17,21 ---- <gnp:register name="subtotal"> <gnp:mode>Normal</gnp:mode> ! <gnp:displayname>Sub Total</gnp:displayname> </gnp:register> </gnp:definitions> |
From: <con...@us...> - 2003-01-03 01:25:21
|
Update of /cvsroot/gnupos/gnupos/src In directory sc8-pr-cvs1:/tmp/cvs-serv22355/src Modified Files: GnuPOSregisters.c GnuPOSxml.c Log Message: Get everything up to date with my tree. Doesn\'t work yet, but getting close (I hope). Index: GnuPOSregisters.c =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOSregisters.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** GnuPOSregisters.c 31 Dec 2002 00:54:35 -0000 1.13 --- GnuPOSregisters.c 3 Jan 2003 01:25:16 -0000 1.14 *************** *** 190,200 **** --- 190,208 ---- registers_struct *reg; + if(gnp_debug) + printf("In gnp_add_register_callback.\n"); + reg=gnp_lookup_register(reg_name); + if(gnp_debug) + printf(" Setting callbacks. sub: %p, param: %s, typed: %d\n",sub, parameter_string, typed); reg->sub = sub; + printf("1\n"); reg->optional = parameter_string; + printf("2\n"); if(typed == 0) reg->typed = FALSE; else reg->typed = TRUE; + printf("3\n"); } Index: GnuPOSxml.c =================================================================== RCS file: /cvsroot/gnupos/gnupos/src/GnuPOSxml.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GnuPOSxml.c 1 Jan 2003 14:09:53 -0000 1.14 --- GnuPOSxml.c 3 Jan 2003 01:25:16 -0000 1.15 *************** *** 1622,1627 **** sub=dlsym(ecurrent->handle,ecurrent->name); - printf("And now we're here.\n"); - if(sub==NULL) { --- 1622,1625 ---- *************** *** 1648,1651 **** --- 1646,1651 ---- gnp_add_register_callback(ecurrent->other_name, sub, ecurrent->parameter_string, ecurrent->param_count); + if(gnp_debug) + printf(" Function callback added.\n"); } else *************** *** 1654,1657 **** --- 1654,1659 ---- exit(-1); } + if(gnp_debug) + printf(" End processing for %s.\n"); ecurrent=ecurrent->next; } |
From: <kr...@us...> - 2003-01-01 17:35:10
|
Update of /cvsroot/gnupos/gnupos2/intl In directory sc8-pr-cvs1:/tmp/cvs-serv17114/intl Log Message: Directory /cvsroot/gnupos/gnupos2/intl added to the repository |
From: <kr...@us...> - 2003-01-01 17:33:40
|
Update of /cvsroot/gnupos/gnupos2/po In directory sc8-pr-cvs1:/tmp/cvs-serv16629/po Log Message: Directory /cvsroot/gnupos/gnupos2/po added to the repository |
From: <con...@us...> - 2003-01-01 14:09:57
|
Update of /cvsroot/gnupos/gnupos In directory sc8-pr-cvs1:/tmp/cvs-serv30543 Modified Files: GSPL.sxw GSPL.txt Makefile.in aclocal.m4 configure Log Message: Fixes to xml parsing, work on making the executable do what it should.... :-) Index: GSPL.sxw =================================================================== RCS file: /cvsroot/gnupos/gnupos/GSPL.sxw,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 Binary files /tmp/cvsvyJlbZ and /tmp/cvsqf7o3N differ Index: GSPL.txt =================================================================== RCS file: /cvsroot/gnupos/gnupos/GSPL.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GSPL.txt 23 Dec 2002 13:43:56 -0000 1.6 --- GSPL.txt 1 Jan 2003 14:09:52 -0000 1.7 *************** *** 1,5 **** GnuPOS State Programming Language (GSPL) ! Version 2.3 (22nd December, 2002) Introduction --- 1,5 ---- GnuPOS State Programming Language (GSPL) ! Version 2.5 (31st December, 2002) Introduction *************** *** 51,54 **** --- 51,60 ---- A unique identifier that identifies this STATION (not USER!). This cannot be changed by the user, and is intended to identify a specific, individual machine to the server. + <userinterface>name</userinterface> + This identifies the designated user interface. The "name" must correspond exactly with the name contained on a library tag. The library so named will be the designated user interface, and will receive control through the routine specified in the <interface-init> tag. + + <interface-init>function</interface-init> + This is the function within the specified user interface library that will receive control once the GnuPOS system has initialised and is ready to run. "function" must be a routine available within the library named in the <userinterface> tag. + </initialisation> *************** *** 124,134 **** Provides a text string to be used when displaying the name of this register to the user. If not provided this defaults to a blank string. This string is not currently used, but may be in the future. ! <mode>fixed|normal|constant|list|fixedlist</mode> ! Sets what mode this register operates in. A fixed mode register cannot be used to contain any data of a different value type to what is defined in the <type> tag. A normal mode register will follow the type of its contents, and will change its value type as appropriate. - A constant mode register is set to its initial value and does not change. Attempting to change a constant register will cause a fatal error. A list mode register is a variable-type "stack" register. The register actually points to a LIFO stack of values accessed by the push() and pop() commands. ! A fixedlist mode register is just like a list mode register, except that the type of the object on the stack is fixed (as a fixed mode register). This tag is optional and will default to normal. --- 130,140 ---- Provides a text string to be used when displaying the name of this register to the user. If not provided this defaults to a blank string. This string is not currently used, but may be in the future. ! <mode>fixed|normal|list|display|readonly</mode> ! Sets what mode(s) this register operates in. A fixed mode register cannot be used to contain any data of a different value type to what is defined in the <type> tag. A normal mode register will follow the type of its contents, and will change its value type as appropriate. A list mode register is a variable-type "stack" register. The register actually points to a LIFO stack of values accessed by the push() and pop() commands. ! A display mode register is a special type of fixed mode register guaranteed to always contain a string. As an added bonus, however, it is possible to no most things you can do with a normal mode register and the results will automatically be converted to a string form. ! A readonly mode register, as the name suggests, can only be read by state programs, not modified. This makes them somewhat useless for normal use, but this mode is used for a number of predefined registers. It is intended that eventually it will be possible for dynamically loaded libraries to modify these (and other) registers, at which point readonly registers might become of more general use. In the interim, you can specify an initial value for them, and they will then work as a constant. This tag is optional and will default to normal. *************** *** 289,292 **** --- 295,300 ---- In all the following function explanations, a register is indicated by "reg1", and "reg2". This must be a string that identifies a register, or a scheme expression that evaluates to a string that defines a register. + The commands are described here in C form, and are missing their leading "gnp:" namespace indicator. One day I'll update this to show these commands in proper guile form, but in the meantime you'll just have to work it out for yourself. Sorry about that, but I'm sure you're up to it. + Register modification commands clear(reg1) *************** *** 339,344 **** If both req1 and reg2 are the same type, they are compared as those types. If one register is an integer, and the other a gncnumeric, the integer is converted to a gncnumeric, and the result compared. ! If one register is a string, and the other a gncnumeric, the string is converted to a gncnumeric as per the gncnum() function, and the result compared. If the string is not in a form that can be converted to a gncnumeric, -99 is returned. ! If one register is a string and the other an integer, the string is converted to an integer as per the int() function and the result compared. If the string is not in a form that can be converted to a gncnumeric, -99 is returned. This function ONLY returns a value to guile. It does not modify the return register. --- 347,352 ---- If both req1 and reg2 are the same type, they are compared as those types. If one register is an integer, and the other a gncnumeric, the integer is converted to a gncnumeric, and the result compared. ! If one register is a string, and the other a gncnumeric, the string is converted to a gncnumeric as per the gncnum() function, and the result compared. If the string is not in a form that can be converted to a gncnumeric, -2 is returned and the error register will contain the appropriate error code. ! If one register is a string and the other an integer, the string is converted to an integer as per the int() function and the result compared. If the string is not in a form that can be converted to a gncnumeric, -2 is returned and the error register will contain the appropriate error. This function ONLY returns a value to guile. It does not modify the return register. *************** *** 367,371 **** State commands changestate(string) ! Changes the state to the specified state immediately, and any commands remaining the the current command.list will be executed in the new state. Note that any <endstate> specified in the <input> tag from which the command.list was taken will still take effect, and will change the state to whatever is specified at the completion of the command.list. String must be the name of a valid, defined state. pushstate() --- 375,379 ---- State commands changestate(string) ! Changes the state to the specified state immediately, and any commands remaining the the current command.list will be executed in the new state. Note that any <endstate> specified in the <input> tag from which the command was taken will still take effect, and will change the state to whatever is specified at the completion of the command. String must be the name of a valid, defined state. pushstate() *************** *** 373,377 **** popstate() ! Pops the top value off the statestack, and changes to that state. Miscellaneous commands --- 381,385 ---- popstate() ! Pops the top value off the statestack, and changes to that state. Once again, note that any <endstate> specified in the <input> tag from which this command sequence was drawn will still take effect, overwriting this change. Miscellaneous commands *************** *** 399,403 **** Using the GnuPOS state language Error handling ! GnuPOS implements a specified error register. This register is updated after every call, and contains an error number to indicate the error received. If the error is zero, no error was received. This section needs to be completed. Had you noticed? --- 407,412 ---- Using the GnuPOS state language Error handling ! GnuPOS implements a specified error register. This register is updated after every call, and contains an error number to indicate the error received. If the error is zero, no error was received. The errorstring() function (not currently implemented) will provide a string describing the error in human readable terms. ! This section needs to be completed. Had you noticed? Index: Makefile.in =================================================================== RCS file: /cvsroot/gnupos/gnupos/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 30 Dec 2002 14:11:39 -0000 1.6 --- Makefile.in 1 Jan 2003 14:09:52 -0000 1.7 *************** *** 60,63 **** --- 60,65 ---- host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ + AWK = @AWK@ BUILD_GUILE = @BUILD_GUILE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ *************** *** 65,68 **** --- 67,72 ---- CC = @CC@ DATADIRNAME = @DATADIRNAME@ + DEPDIR = @DEPDIR@ + EXEEXT = @EXEEXT@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ *************** *** 88,91 **** --- 92,96 ---- GUILE_LIBS = @GUILE_LIBS@ HAVE_LIB = @HAVE_LIB@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ *************** *** 101,104 **** --- 106,110 ---- MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ + OBJEXT = @OBJEXT@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ *************** *** 118,123 **** --- 124,132 ---- XPM_LIBS = @XPM_LIBS@ ZVT_LIBS = @ZVT_LIBS@ + am__include = @am__include@ + am__quote = @am__quote@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ top_builddir = @top_builddir@ Index: aclocal.m4 =================================================================== RCS file: /cvsroot/gnupos/gnupos/aclocal.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** aclocal.m4 30 Dec 2002 02:17:17 -0000 1.3 --- aclocal.m4 1 Jan 2003 14:09:52 -0000 1.4 *************** *** 1,13 **** ! dnl aclocal.m4 generated automatically by aclocal 1.4-p5 ! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. ! dnl This file is free software; the Free Software Foundation ! dnl gives unlimited permission to copy and/or distribute it, ! dnl with or without modifications, as long as this notice is preserved. ! dnl This program is distributed in the hope that it will be useful, ! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without ! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A [...1025 lines suppressed...] - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" - ]) - - dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the - dnl variables prefix and exec_prefix bound to the values they will have - dnl at the end of the configure script. - AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], - [ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" ]) --- 2654,2657 ---- Index: configure =================================================================== RCS file: /cvsroot/gnupos/gnupos/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure 30 Dec 2002 14:11:39 -0000 1.5 --- configure 1 Jan 2003 14:09:52 -0000 1.6 *************** *** 13,16 **** --- 13,19 ---- # Any additions from configure.in: ac_help="$ac_help + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors" + ac_help="$ac_help --with-gnome-includes Specify location of GNOME headers" ac_help="$ac_help *************** *** 561,565 **** [...2939 lines suppressed...] ! :loop ! s/\\\\$// ! p ! n ! /\\\\$/ b loop ! p ! } ! /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ! sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ! # Make sure the directory exists. ! test -f "$dirpart/$file" && continue ! fdir=`echo "$file" | sed -e 's|/[^/]*$||'` ! $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 ! # echo "creating $dirpart/$file" ! echo '# dummy' > "$dirpart/$file" ! done ! done ! for ac_file in $CONFIG_FILES; do |