]> git.pld-linux.org Git - packages/LPRng.git/blame - LPRng-ac_fixes.patch
projects / packages / LPRng.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- BuildRequires: automake
[packages/LPRng.git] / LPRng-ac_fixes.patch
CommitLineData
ed49b813
AF		 1--- LPRng-3.7.5/src/Makefile.in.wiget Wed Jan 10 01:59:06 2001
2+++ LPRng-3.7.5/src/Makefile.in Tue Oct 9 14:53:05 2001
3@@ -33,7 +33,8 @@
4 @SET_MAKE@
5
6 # what C compiler to use.
7-CC:=@CC@
8+CC=@CC@
9+datadir=@datadir@
10
11 # what command to use to "ranlib" or "lorder" the library.
12 RANLIB=@RANLIB@
13@@ -47,14 +48,9 @@
14 SHELL_PATH=@SHELL@
15 SHELL = @SHELL@
16
17-# loader for c programs
18-LDCC=@LDCC@
19-
20 # any libs that need to be used to get these programs to compile:
21-LIBS=@USE_GDBM_LIB@ @INTLLIBS@ @LIBS@
22+LIBS=@LIBS@
23
24-# add path to internationalization
25-INTLINCS=@INTLINCS@
26
27 ### PATHS ####
28 # prefix
29@@ -72,12 +68,10 @@
30
31 # install options
32
33-STRIP=@STRIP@
34
35 CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ \
36 -I${top_builddir} \
37- -I${SRC}/include -I${SRC}/common @INTLINCS@ \
38- -I@USE_GDBM_INC_DIR@ \
39+ -I${SRC}/include -I${SRC}/common \
40 -DCHOWN=\"@CHOWN@\" \
41 -DCHGRP=\"@CHGRP@\" \
42 -DPRINTCAP_PATH=\"@PRINTCAP_PATH@\" \
43@@ -91,16 +85,15 @@
44 -DCLEAR=\"@CLEAR@\" \
45 -DUSERID=\"@USERID@\" \
46 -DGROUPID=\"@GROUPID@\" \
47- -DLOCALEDIR=\"@LOCALEDIR@\"
48+ -DLOCALEDIR=\"$(datadir)/locale\"
49
50
51 USER_OBJS := @USER_OBJS@
52-LDFLAGS := -L@USE_GDBM_LIB_DIR@ @LDFLAGS@
53+LDFLAGS := @LDFLAGS@
54
55 FILTER_DIR = @FILTER_DIR@
56 LPD_DIR = @LPD_DIR@
57
58-STRIP = @STRIP@
59
60 #********************** End of configure modifiable settings ************
61
62@@ -178,7 +171,7 @@
63
64
65 SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE
66-INCLUDE=.. ${SRC}/include ${INTLINCS}
67+INCLUDE=.. ${SRC}/include
68
69 VPATH=..:.:${SRC}/include:${SRC}/common
70
71@@ -244,33 +237,33 @@
72 $(RANLIB) $@
73
74 lpd: $(LPD_OBJS) liblpr.a
75- $(LDCC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
76+ $(CC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
77 lpr: $(LPR_OBJS) liblpr.a
78- $(LDCC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
79+ $(CC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
80 lpq: $(LPQ_OBJS) liblpr.a
81- $(LDCC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
82+ $(CC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
83 lpstat: $(LPSTAT_OBJS) liblpr.a
84- $(LDCC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
85+ $(CC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
86 lprm: $(LPRM_OBJS) liblpr.a
87- $(LDCC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
88+ $(CC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
89 lpc: $(LPC_OBJS) liblpr.a
90- $(LDCC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
91+ $(CC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
92 checkpc: $(CHECKPC_OBJS) liblpr.a
93- $(LDCC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
94+ $(CC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
95 lpf: $(LPF_OBJS)
96- $(LDCC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
97+ $(CC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
98 lpbanner: $(LPBANNER_OBJS)
99- $(LDCC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
100+ $(CC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
101 monitor: $(MONITOR_OBJS) liblpr.a
102- $(LDCC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
103+ $(CC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
104
105 authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh
106 rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@
107
108 sserver: sserver.o liblpr.a
109- $(LDCC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
110+ $(CC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
111 sclient: sclient.o liblpr.a
112- $(LDCC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
113+ $(CC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
114
115 sendauth.o lpd_secure.o : user_auth.stub
116
117@@ -307,17 +300,17 @@
118 if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \
119 done;
120
121- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
122- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
123- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
124- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
125- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
126- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
127- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
128- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
129- ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
130- ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
131- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
132+ ${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
133+ ${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
134+ ${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
135+ ${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
136+ ${INSTALLCMD} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
137+ ${INSTALLCMD} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
138+ ${INSTALLCMD} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
139+ ${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
140+ ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
141+ ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
142+ ${INSTALLCMD} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
143 cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
144
145 uninstall:
146--- LPRng-3.7.5/man/Makefile.in.wiget Mon Jan 8 20:19:50 2001
147+++ LPRng-3.7.5/man/Makefile.in Tue Oct 9 14:53:05 2001
148@@ -22,8 +22,8 @@
149
150 ## fix up prefix to be a make variable
151 prefix = @prefix@
152-MAN = @mandir@
153-SHELL = @SHELL@
154+mandir = @mandir@
155+SHELL = @SHELL@
156
157 # Install man pages in compressed form.
158 # COMPRESS = compression utility
159@@ -61,13 +61,13 @@
160 install:
161 for suffix in 1 2 3 4 5 6 7 8 ; do \
162 if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
163- if [ ! -d $(DESTDIR)$(MAN)/man$${suffix} ] ; then \
164- echo ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
165- ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
166+ if [ ! -d $(DESTDIR)$(mandir)/man$${suffix} ] ; then \
167+ echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
168+ ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
169 fi; \
170 for i in ${SRC}/*.$$suffix; do \
171- echo $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
172- $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
173+ echo $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
174+ $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
175 done; \
176 fi; \
177 done;
178@@ -76,8 +76,8 @@
179 for suffix in 1 2 3 4 5 6 7 8 ; do \
180 if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
181 for i in ${SRC}/*.$$suffix; do \
182- echo rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
183- rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
184+ echo rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
185+ rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
186 done; \
187 fi; \
188 done;
189--- LPRng-3.7.5/configure.in.wiget Mon Jan 15 21:26:40 2001
190+++ LPRng-3.7.5/configure.in Tue Oct 9 14:53:05 2001
cc1b0674 191@@ -13,46 +13,13 @@
87cc09c5 192 AC_CANONICAL_SYSTEM
193 AC_CONFIG_HEADER(config.h)
194
195-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
196-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
197-AC_SUBST(PACKAGE)
198-AC_SUBST(VERSION)
199-ALL_LINGUAS="fr"
cc1b0674 200-
87cc09c5 201-AC_PREFIX_DEFAULT(/usr/local)
202-AC_SUBST(INSTALL)
203-AC_SUBST(INSTALL_MAN)
204-AC_SUBST(SHELL)
205-AC_SUBST(CPP)
206-AC_SUBST(CFLAGS)
207-AC_SUBST(CPPFLAGS)
208-AC_SUBST(LDFLAGS)
209-AC_SUBST(LDCC)
180912a5 210+AM_INIT_AUTOMAKE(LPRng, 3.7.4)
87cc09c5 211
212 dnl check for awk
213 AC_PROG_AWK
214-AC_SUBST(AWK)
cc1b0674 215-AC_PATH_PROG(PERL,perl)dnl
87cc09c5 216-AC_SUBST(PERL)dnl
cc1b0674 217-AC_PATH_PROG(CHOWN,chown)dnl
218-AC_SUBST(CHOWN)dnl
219-AC_PATH_PROG(CHGRP,chgrp)dnl
220-AC_SUBST(CHGRP)dnl
221-
87cc09c5 222-
223-WITH_CC dnl
224-WITH_CCOPTS dnl
225-WITH_LINKER dnl
226-WITH_LDOPTS dnl
227-WITH_CPPOPTS dnl
228-
a0d9810a 229-if test -z "$LOCALEDIR" ; then
230- LOCALEDIR='$(prefix)/share/locale'
231-fi;
232-
233-WITH_LOCALEDIR dnl
234-
235-
cc1b0674 236+AC_PATH_PROG(PERL,perl)
237+AC_PATH_PROG(CHOWN,chown)
238+AC_PATH_PROG(CHGRP,chgrp)
239
87cc09c5 240 dnl ----------------------------------------------------------------------------
241 dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
ed49b813
AF		 242@@ -86,31 +53,6 @@
243 USE_GDBM_BUILD_DIR=`pwd`/db
244 USE_GDBM_LIB_DIR=`pwd`/db/.libs
245 USE_GDBM_INC_DIR=`pwd`/db
246- d=${srcdir}/${USE_GDBM}
247-# USE_GDBM=db-3.1.17
248-# USE_GDBM_LIB="-ldb"
249-# USE_GDBM_BUILD_DIR=`pwd`/db
250-# USE_GDBM_LIB_DIR=`pwd`/db
251-# USE_GDBM_INC_DIR=`pwd`/db
252-# d=${srcdir}/${USE_GDBM}/dist
253- if test "!" -d db ; then
254- mkdir db
255- fi
256- if test "!" -d ${d} ; then
257- echo "Missing $d";
258- exit 1
259- fi
260- e=`cd $d; pwd`
261- echo DIR $d is $e
262- f=$e/configure
263- if test "!" -f $f ; then
264- echo "Missing $f";
265- exit 1
266- fi
267- echo "#!/bin/sh
268-/bin/sh $f \"\$@\" --srcdir=$e
269-" >db/configure
270- chmod a+x db/configure
271 fi
272 AC_SUBST(USE_GDBM)dnl
273 AC_SUBST(USE_GDBM_LIB)dnl
274@@ -382,38 +324,11 @@
87cc09c5 275 AC_MSG_RESULT($FILTER_DIR)
276 AC_SUBST(FILTER_DIR)
277
278-dnl default strip binaries
279-AC_MSG_CHECKING(disable stripped binaries)
280-AC_ARG_ENABLE( strip,
281-[ --disable-strip disable stripping binaries by default],
282-[v=no; STRIP=""; ],
283-[v=yes; STRIP="-s"; ]
284-)
285-AC_MSG_RESULT($v)
286-AC_SUBST(STRIP)
a0d9810a 287-
87cc09c5 288-
289 dnl ----------------------------------------------------------------------------
290 dnl ----------- C compiler checks -----------------------------------------
291 AC_PROG_CC
292 AC_PROG_CPP
293
294-if test "$ac_cv_prog_gcc" = yes; then
295- cat >conftest.c <<EOF
296-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
297-yes
298-#endif
299-EOF
300- if ${CC-cc} -E conftest.c | egrep yes >/dev/null 2>&1; then
301- gcc -v
302- echo "WARNING: gcc -O (version 2.4.5 and below) produces incorrect code"
303- echo " for lpd.c and other large routines. Update your GCC compiler"
304- exit 1
305- fi;
306-fi;
307-
308-LDCC="$CC"
309-
310 dnl ----------------------------------------------------------------------------
311 dnl ------------ OS Checks --------------------------------------------------
312 AC_ISC_POSIX
ed49b813 313@@ -1359,38 +1274,9 @@
a0d9810a 314 SHELL=/bin/sh
87cc09c5 315 AC_MSG_RESULT(using $SHELL (FORCED))
316
87cc09c5 317+ALL_LINGUAS="fr"
318 AM_GNU_GETTEXT
319
a0d9810a 320- if test "${USE_NLS}" = yes; then
321- AC_MSG_CHECKING([Using NLS, localedir ${LOCALEDIR}, ])
322- if test "${USE_INCLUDED_LIBINTL}" = yes ; then
323- AC_MSG_RESULT([using the local libintl installation])
324- if test -f ${srcdir}/${nls_cv_header_libgt} ; then
325- INTLINCS='-I $(top_builddir)/intl'
326- else
327- AC_MSG_RESULT([NLS enabled, local libintl support is needed, and])
328- AC_MSG_RESULT([ source code is not in the ${srcdir}/intl directory.])
329- AC_MSG_RESULT([ See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details.])
330- exit 1;
331- fi
332- else
333- AC_MSG_RESULT([using -lintl])
334- INTLLIBS=-lintl
335- fi
336- else
337- AC_MSG_RESULT([No NLS])
338- fi
339- if test "${USE_NLS}" != yes -o "${USE_INCLUDED_LIBINTL}" != yes ; then
340- nls_cv_header_intl=
341- nls_cv_header_libgt=
342- fi
343- if test "$XGETTEXT" = "" ; then
344- XGETTEXT=xgettext;
345- fi
346- AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
347- AC_SUBST(INTLINCS)
348- AC_SUBST(INTLLIBS)
349-
87cc09c5 350 dnl ----------------------------------------------------------------------------
a0d9810a 351 dnl ----------------- END OF GENERAL CONFIGURATION ---------------------------
352
ed49b813
AF		 353@@ -1525,11 +1411,7 @@
354 fi;
a0d9810a 355
87cc09c5 356
ed49b813
AF		 357-if test "$USE_GDBM" != "" ; then
358- AC_CONFIG_SUBDIRS( db )
359-fi
87cc09c5 360 AC_OUTPUT(
a0d9810a 361-[
87cc09c5 362 Makefile
87cc09c5 363 HOWTO/Makefile
364 TESTSUPPORT/Makefile
ed49b813 365@@ -1558,28 +1440,22 @@
87cc09c5 366 src/psbanner
a0d9810a 367 po/Makefile.in
368 intl/Makefile
369-],
370-[
371-for i in \
372-UTILS/LPRng.pm \
373-UTILS/accounting.pl \
374-UTILS/decode_args_with_perl \
375-UTILS/decode_args_with_sh \
376-UTILS/fixid \
377-UTILS/fixupdate \
378-UTILS/lpq_in_perl \
379-UTILS/lpr_in_perl \
380-UTILS/lprm_in_perl \
381-UTILS/make_lpd_conf \
382-UTILS/make_printcap_use \
383-UTILS/makeinc \
384-UTILS/read_conf \
385-UTILS/remote_active \
386-UTILS/test_read \
387-UTILS/update_z.pl \
388-; do chmod +x $i ; done
389-]
87cc09c5 390-
a0d9810a 391+UTILS/LPRng.pm
392+UTILS/accounting.pl
393+UTILS/decode_args_with_perl
394+UTILS/decode_args_with_sh
395+UTILS/fixid
396+UTILS/fixupdate
397+UTILS/lpq_in_perl
398+UTILS/lpr_in_perl
399+UTILS/lprm_in_perl
400+UTILS/make_lpd_conf
401+UTILS/make_printcap_use
402+UTILS/makeinc
403+UTILS/read_conf
404+UTILS/remote_active
405+UTILS/test_read
406+UTILS/update_z.pl
87cc09c5 407 )
408
409 dnl ----------------------------------------------------------------------------
ed49b813
AF		 410--- LPRng-3.7.5/Makefile.in.wiget Mon Jan 15 22:27:47 2001
411+++ LPRng-3.7.5/Makefile.in Tue Oct 9 14:53:45 2001
bb5055ef 412@@ -44,7 +44,6 @@
413 LOCKFILE=\"@LOCKFILE@\"
414 PSHOWALL="@PSHOWALL@"
415 FILTER_DIR=@FILTER_DIR@
416-LOCALEDIR=@LOCALEDIR@
417 INIT=@INIT@
418 USE_NLS=@USE_NLS@
ed49b813
AF		 419 USE_GDBM=@USE_GDBM@
420@@ -58,7 +57,7 @@
421 # ALLDIRS for other such as documentation
422 #=============================================================================
423
424-DIRS= UTILS ${USE_GDBM_BUILD_DIR} intl src po man
425+DIRS= UTILS intl src po man
426 INSTALLDIRS= UTILS intl src po man
427 FILES=./postinstall ./preremove ./postremove ./lpd.conf
428 ALLDIRS= ${DIRS} ${SRC}/TESTSUPPORT ${SRC}/HOWTO ${SRC}/DISTRIBUTIONS
429@@ -113,7 +112,7 @@
bb5055ef 430 ###############################################################################
431 $(ALLDIRS): FRC
432 if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
433- cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
434+ cd $@; $(MAKE) \
435 DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
436 fi
437
A next-generation printing system for UNIX
This page took 0.085541 seconds and 4 git commands to generate.