aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--.gitmodules3
-rw-r--r--Makefile.am22
-rw-r--r--README-hacking35
-rw-r--r--bootstrap.conf7
-rw-r--r--configure.ac46
-rw-r--r--gconf/.gitignore4
-rw-r--r--gconf/Makefile.am17
-rw-r--r--gconf/gconf-format.c200
-rw-r--r--gconf/gconf-gram.y891
-rw-r--r--gconf/gconf-lex.l476
-rw-r--r--gconf/gconf-preproc.c728
-rw-r--r--gconf/gconf-text.c73
-rw-r--r--gconf/gconf.h163
-rw-r--r--gconf/gnulib.modules14
-rw-r--r--gconf/wordsplit.c568
-rw-r--r--gconf/wordsplit.h88
m---------grecs0
-rw-r--r--src/Makefile.am4
-rw-r--r--src/cmdline.opt18
-rw-r--r--src/config.c476
-rw-r--r--src/diskio.c8
-rw-r--r--src/tcpwrap.c22
-rw-r--r--src/wydawca.c10
-rw-r--r--src/wydawca.h14
-rw-r--r--tests/Makefile.am4
26 files changed, 320 insertions, 3575 deletions
diff --git a/.gitignore b/.gitignore
index 5e9c566..4c9b75d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
1*.a
2*.o
1*.tar.* 3*.tar.*
2*~ 4*~
3*.o
4*.a
5.bootstrap 5.bootstrap
6.deps 6.deps
7.emacs.desktop 7.emacs.desktop
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..fea8f96
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
1[submodule "grecs"]
2 path = grecs
3 url = git://git.gnu.org.ua/grecs.git
diff --git a/Makefile.am b/Makefile.am
index 1eac948..743b2be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,34 +14,16 @@
14# You should have received a copy of the GNU General Public License 14# You should have received a copy of the GNU General Public License
15# along with wydawca. If not, see <http://www.gnu.org/licenses/>. 15# along with wydawca. If not, see <http://www.gnu.org/licenses/>.
16 16
17ACLOCAL_AMFLAGS = -I m4 17ACLOCAL_AMFLAGS = -I m4 -I grecs/am
18AUTOMAKE_OPTIONS = gnu 1.8.5 18AUTOMAKE_OPTIONS = gnu 1.8.5
19 19
20SUBDIRS=gnu gconf src doc etc tests 20SUBDIRS=gnu grecs src doc etc tests
21 21
22# We never remove files from the configuration directory 22# We never remove files from the configuration directory
23distuninstallcheck_listfiles = \ 23distuninstallcheck_listfiles = \
24 find $(prefix) -type f -not -path '$(sysconfdir)/*' 24 find $(prefix) -type f -not -path '$(sysconfdir)/*'
25 25
26gen_start_date = 2009-01-25 26gen_start_date = 2009-01-25
27.PHONY: make-ChangeLog
28make-ChangeLog:
29 if test -d .git; then \
30 $(top_srcdir)/build-aux/gitlog-to-changelog \
31 --since=$(gen_start_date) | \
32 sed '/<unknown>$$/d' | fmt -s > $(distdir)/cl-t; \
33 cat ChangeLog.svn | sed '/^Local Variables:/,/^End:/d' \
34 >> $(distdir)/cl-t; \
35 echo "Local Variables:" >> $(distdir)/cl-t; \
36 echo "mode: change-log" >> $(distdir)/cl-t; \
37 echo "version-control: never" >> $(distdir)/cl-t; \
38 echo "buffer-read-only: t" >> $(distdir)/cl-t; \
39 echo "End:" >> $(distdir)/cl-t; \
40 rm -f $(distdir)/ChangeLog; \
41 mv $(distdir)/cl-t $(distdir)/ChangeLog; \
42 fi
43
44dist-hook: make-ChangeLog
45 27
46.PHONY: ChangeLog 28.PHONY: ChangeLog
47ChangeLog: 29ChangeLog:
diff --git a/README-hacking b/README-hacking
index 19b957a..a746607 100644
--- a/README-hacking
+++ b/README-hacking
@@ -1,44 +1,59 @@
1These notes intend to help people working on the SVN version of 1These notes intend to help people working on the Git version of
2this package. See end of this file for the copying conditions. 2this package. See end of this file for the copying conditions.
3 3
4* Requirements 4* Requirements
5 5
6You need the following packages to build the SVN version of Wydawca. I do 6You need the following packages to build the Git version of Wydawca. I do
7not make any efforts to accommodate older versions of these packages, 7not make any efforts to accommodate older versions of these packages,
8so please make sure that you have the latest stable version. 8so please make sure that you have the latest stable version.
9 9
10- Automake <http://www.gnu.org/software/automake/> 10- Automake <http://www.gnu.org/software/automake/>
11- Autoconf <http://www.gnu.org/software/autoconf/> 11- Autoconf <http://www.gnu.org/software/autoconf/>
12- Bison <http://www.gnu.org/software/bison/> 12- Bison <http://www.gnu.org/software/bison/>
13- Git <http://git.or.cz>
13- Gnulib <http://www.gnu.org/software/gnulib/> 14- Gnulib <http://www.gnu.org/software/gnulib/>
15- Grecs <http://puszcza.gnu.org.ua/projects/grecs>
14- Flex <http://flex.sourceforge.net/> 16- Flex <http://flex.sourceforge.net/>
15- M4 <http://www.gnu.org/software/m4/> 17- M4 <http://www.gnu.org/software/m4/>
16- Mailutils <http://www.gnu.org/software/mailutils/> 18- Mailutils <http://www.gnu.org/software/mailutils/>
17- Subversion <http://subversion.tigris.org/>
18- Texinfo <http://www.gnu.org/software/texinfo> 19- Texinfo <http://www.gnu.org/software/texinfo>
19 20
20* Bootstrapping 21* Bootstrapping
21 22
22Obviously, if you are reading these notes, you did manage to check out 23Obviously, if you are reading these notes, you did manage to clone
23the source tree from SVN. The next step is to create the configuration 24the source tree from the Git repository. The next step is to create
24framework: 25the configuration framework:
25 26
261. Change to the source tree directory 271. Change to the source tree directory
27 28
28 $ cd wydawca 29 $ cd wydawca
29 30
302. Run `bootstrap' pointing the --gnulib-srcdir option to the location 312. Run `bootstrap':
31of the local directory where gnulib sources reside, e.g.:
32 32
33 ./bootstrap --gnulib-srcdir=/usr/src/gnulib 33 ./bootstrap
34 34
35Once done, proceed as described in the file README (section 35Once done, proceed as described in the file README (section
36`Installation'). 36`Installation').
37 37
38Normally you will have to run bootstrap only once. However, if you
39intend to hack on Wydawca, you might need to run it again later. In
40this case, you will probably want to save some time and bandwidth by
41avoiding downloading the same files again. If so, create in the Wydawca
42root directory the file named `.bootstrap' with the following
43contents:
44
45 --gnulib-srcdir=$HOME/gnulib
46
47Replace `$HOME/gnulib' with the actual directory where the Gnulib
48sources reside.
49
50For more information about `bootstrap', run `bootstrap --help'.
51
52
38 53
39* Copyright information 54* Copyright information
40 55
41 Copyright (C) 2007 Sergey Poznyakoff 56 Copyright (C) 2007, 2009 Sergey Poznyakoff
42 57
43 Permission is granted to anyone to make or distribute verbatim copies 58 Permission is granted to anyone to make or distribute verbatim copies
44 of this document as received, in any medium, provided that the 59 of this document as received, in any medium, provided that the
diff --git a/bootstrap.conf b/bootstrap.conf
index 6119189..fde2671 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -21,6 +21,11 @@ gnulib_mk=Makefile.am
21 21
22test -d $source_base || mkdir -p $source_base 22test -d $source_base || mkdir -p $source_base
23 23
24if git config submodule.grecs.url >/dev/null; then : ; else
25 git submodule init || exit $?
26 git submodule update || exit $?
27fi
28
24# We don't need these modules, even though gnulib-tool mistakenly 29# We don't need these modules, even though gnulib-tool mistakenly
25# includes them because of gettext dependencies. 30# includes them because of gettext dependencies.
26avoided_gnulib_modules=' 31avoided_gnulib_modules='
@@ -29,7 +34,7 @@ avoided_gnulib_modules='
29' 34'
30 35
31# gnulib modules used by this package. 36# gnulib modules used by this package.
32gnulib_modules="`grep -h '^[^#]' gnulib.modules gconf/gnulib.modules | sort | uniq`" 37gnulib_modules="`grep -h '^[^#]' gnulib.modules grecs/gnulib.modules | sort | uniq`"
33 38
34# Additional xgettext options to use. Use "\\\newline" to break lines. 39# Additional xgettext options to use. Use "\\\newline" to break lines.
35XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ 40XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
diff --git a/configure.ac b/configure.ac
index 604ccc4..48e1252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,48 +106,9 @@ fi
106if test "$status_tcpwrap" = yes; then 106if test "$status_tcpwrap" = yes; then
107 AC_DEFINE_UNQUOTED([WITH_LIBWRAP],1,[Defined if compiling with libwrap]) 107 AC_DEFINE_UNQUOTED([WITH_LIBWRAP],1,[Defined if compiling with libwrap])
108fi 108fi
109
110# **********************
111# Preprocessor
112# **********************
113AC_ARG_WITH([preprocessor],
114 AC_HELP_STRING([--without-preprocessor],
115 [do not use external preprocessor]),
116 [
117case "${withval}" in
118yes) use_ext_pp=yes ;;
119no) use_ext_pp=no ;;
120*) AC_MSG_ERROR(bad value ${withval} for --with-preprocessor) ;;
121esac],[use_ext_pp=yes])
122
123if test $use_ext_pp != no; then
124 # Check for default preprocessor
125