diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2019-07-22 16:18:17 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2019-07-22 16:18:17 +0300 |
commit | 4b670788bc8a21cf04119a8fd8ae2733860f2b9b (patch) | |
tree | 438c3178d14999a80e68914bd90609f564341a67 | |
parent | f8c247bb21e2e93b95f778bf43a7de02a7d1b000 (diff) | |
download | wydawca-4b670788bc8a21cf04119a8fd8ae2733860f2b9b.tar.gz wydawca-4b670788bc8a21cf04119a8fd8ae2733860f2b9b.tar.bz2 |
Install default pp-setup file from grecs
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | src/Makefile.am | 5 | ||||
-rw-r--r-- | src/pp-setup | 106 |
3 files changed, 3 insertions, 111 deletions
diff --git a/configure.ac b/configure.ac index ca2935d..b070a4c 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -146,7 +146,8 @@ AM_CONDITIONAL([COND_INOTIFY],[test $status_inotify = yes]) | |||
146 | 146 | ||
147 | # Grecs subsystem | 147 | # Grecs subsystem |
148 | 148 | ||
149 | GRECS_SETUP([grecs],[tree-api git2chg getopt tests shared install-headers]) | 149 | GRECS_SETUP([grecs],[tree-api git2chg getopt tests shared install-headers |
150 | std-pp-setup]) | ||
150 | 151 | ||
151 | AH_BOTTOM([ | 152 | AH_BOTTOM([ |
152 | #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) | 153 | #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) |
diff --git a/src/Makefile.am b/src/Makefile.am index 2ba575e..0109754 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -57,16 +57,13 @@ wydawca_SOURCES=\ | |||
57 | $(WATCHER_C) | 57 | $(WATCHER_C) |
58 | 58 | ||
59 | BUILT_SOURCES=cmdline.h | 59 | BUILT_SOURCES=cmdline.h |
60 | EXTRA_DIST=cmdline.opt pp-setup | 60 | EXTRA_DIST=cmdline.opt |
61 | 61 | ||
62 | SUFFIXES=.opt .c .h | 62 | SUFFIXES=.opt .c .h |
63 | 63 | ||
64 | .opt.h: | 64 | .opt.h: |
65 | $(AM_V_GEN)m4 -s $(top_srcdir)/@GRECS_SUBDIR@/build-aux/getopt.m4 $< > $@ | 65 | $(AM_V_GEN)m4 -s $(top_srcdir)/@GRECS_SUBDIR@/build-aux/getopt.m4 $< > $@ |
66 | 66 | ||
67 | incdir=$(pkgdatadir)/$(VERSION)/include | ||
68 | inc_DATA = $(PP_SETUP_FILE) | ||
69 | |||
70 | LDADD=@GRECS_LDADD@ @SQLLIB@ @GPGMELIB@ @LIBLTDL@ | 67 | LDADD=@GRECS_LDADD@ @SQLLIB@ @GPGMELIB@ @LIBLTDL@ |
71 | AM_CPPFLAGS= \ | 68 | AM_CPPFLAGS= \ |
72 | -I$(top_srcdir)/include\ | 69 | -I$(top_srcdir)/include\ |
diff --git a/src/pp-setup b/src/pp-setup deleted file mode 100644 index f49c295..0000000 --- a/src/pp-setup +++ /dev/null | |||
@@ -1,106 +0,0 @@ | |||
1 | divert(-1) dnl -*- m4 -*- | ||
2 | # This file is part of Wydawca | ||
3 | # Copyright (C) 2007, 2009, 2010, 2011, 2017, 2019 Sergey Poznyakoff | ||
4 | # | ||
5 | # Wydawca is free software; you can redistribute it and/or modify | ||
6 | # it under the terms of the GNU General Public License as published by | ||
7 | # the Free Software Foundation; either version 3, or (at your option) | ||
8 | # any later version. | ||
9 | # | ||
10 | # Wydawca is distributed in the hope that it will be useful, | ||
11 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | # GNU General Public License for more details. | ||
14 | # | ||
15 | # You should have received a copy of the GNU General Public License | ||
16 | # along with Wydawca. If not, see <http://www.gnu.org/licenses/>. | ||
17 | |||
18 | changecom(/*,*/) | ||
19 | |||
20 | /* ------------------------------ | ||
21 | * Simulate --prefix-builtins. | ||
22 | * Borrowed from Autoconf | ||
23 | * ------------------------------- */ | ||
24 | |||
25 | define(`m4_define', defn(`define')) | ||
26 | define(`m4_defn', defn(`defn')) | ||
27 | define(`m4_undefine', defn(`undefine')) | ||
28 | |||
29 | m4_undefine(`define') | ||
30 | m4_undefine(`defn') | ||
31 | m4_undefine(`undefine') | ||
32 | |||
33 | /* m4_copy(SRC, DST) | ||
34 | * ----------------- | ||
35 | * Define DST as the definition of SRC. | ||
36 | * What's the difference between: | ||
37 | * 1. m4_copy(`from', `to') | ||
38 | * 2. m4_define(`to', `from($@)') | ||
39 | * Well, obviously 1 is more expensive in space. Maybe 2 is more expensive | ||
40 | * in time, but because of the space cost of 1, it's not that obvious. | ||
41 | * Nevertheless, one huge difference is the handling of `$0'. If `from' | ||
42 | * uses `$0', then with 1, `to''s `$0' is `to', while it is `from' in 2. | ||
43 | * The user will certainly prefer to see `to'. | ||
44 | */ | ||
45 | m4_define(`m4_copy', | ||
46 | `m4_define(`$2', m4_defn(`$1'))') | ||
47 | |||
48 | /* m4_rename(SRC, DST) | ||
49 | * ------------------- | ||
50 | * Rename the macro SRC as DST. | ||
51 | */ | ||
52 | m4_define(`m4_rename', | ||
53 | `m4_copy(`$1', `$2')m4_undefine(`$1')') | ||
54 | |||
55 | /* m4_rename_m4(MACRO-NAME) | ||
56 | * ------------------------ | ||
57 | * Rename MACRO-NAME as m4_MACRO-NAME. | ||
58 | */ | ||
59 | m4_define(`m4_rename_m4', | ||
60 | `m4_rename(`$1', `m4_$1')') | ||
61 | |||
62 | /* Some m4 internals have names colliding with tokens we might use. | ||
63 | * Rename them a` la `m4 --prefix-builtins'. | ||
64 | */ | ||
65 | m4_rename_m4(`builtin') | ||
66 | m4_rename_m4(`changecom') | ||
67 | m4_rename_m4(`changequote') | ||
68 | m4_rename_m4(`debugfile') | ||
69 | m4_rename_m4(`debugmode') | ||
70 | m4_rename_m4(`decr') | ||
71 | m4_rename_m4(`divert') | ||
72 | m4_rename_m4(`divnum') | ||
73 | m4_rename_m4(`dumpdef') | ||
74 | m4_rename_m4(`errprint') | ||
75 | m4_rename_m4(`esyscmd') | ||
76 | m4_rename_m4(`eval') | ||
77 | m4_rename_m4(`format') | ||
78 | m4_rename_m4(`ifdef') | ||
79 | m4_rename_m4(`ifelse') | ||
80 | m4_rename_m4(`include') | ||
81 | m4_rename_m4(`incr') | ||
82 | m4_rename_m4(`index') | ||
83 | m4_rename_m4(`indir') | ||
84 | m4_rename_m4(`len') | ||
85 | m4_rename(`m4exit', `m4_exit') | ||
86 | m4_rename(`m4wrap', `m4_wrap') | ||
87 | m4_rename_m4(`maketemp') | ||
88 | m4_rename_m4(`patsubst') | ||
89 | m4_rename_m4(`popdef') | ||
90 | m4_rename_m4(`pushdef') | ||
91 | m4_rename_m4(`regexp') | ||
92 | m4_rename_m4(`shift') | ||
93 | m4_rename_m4(`sinclude') | ||
94 | m4_rename_m4(`substr') | ||
95 | m4_rename_m4(`symbols') | ||
96 | m4_rename_m4(`syscmd') | ||
97 | m4_rename_m4(`sysval') | ||
98 | m4_rename_m4(`traceoff') | ||
99 | m4_rename_m4(`traceon') | ||
100 | m4_rename_m4(`translit') | ||
101 | m4_rename_m4(`undivert') | ||
102 | m4_rename_m4(`dnl') | ||
103 | m4_rename_m4(`__line__') | ||
104 | m4_rename_m4(`__file__') | ||
105 | |||
106 | m4_divert(0)m4_dnl | ||