1 diff -Nru LPRng-3.7.2/configure.in LPRng-3.7.2.new/configure.in
2 --- LPRng-3.7.2/configure.in Thu Dec 21 20:42:25 2000
3 +++ LPRng-3.7.2.new/configure.in Thu Dec 21 20:45:20 2000
6 AC_CONFIG_HEADER(config.h)
8 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
9 -AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
14 -AC_PREFIX_DEFAULT(/usr/local)
16 -AC_SUBST(INSTALL_MAN)
23 +AM_INIT_AUTOMAKE(LPRng, 3.7.2)
28 -AC_PATH_PROG(PERL,perl)dnl
30 -AC_PATH_PROG(CHOWN,chown)dnl
32 -AC_PATH_PROG(CHGRP,chgrp)dnl
42 -if test -z "$LOCALEDIR" ; then
43 - LOCALEDIR='$(prefix)/share/locale'
49 +AC_PATH_PROG(PERL,perl)
50 +AC_PATH_PROG(CHOWN,chown)
51 +AC_PATH_PROG(CHGRP,chgrp)
53 dnl ----------------------------------------------------------------------------
54 dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
56 AC_MSG_RESULT($FILTER_DIR)
59 -dnl default strip binaries
60 -AC_MSG_CHECKING(disable stripped binaries)
61 -AC_ARG_ENABLE( strip,
62 -[ --disable-strip disable stripping binaries by default],
64 -[v=yes; STRIP="-s"; ]
70 dnl ----------------------------------------------------------------------------
71 dnl ----------- C compiler checks -----------------------------------------
75 -if test "$ac_cv_prog_gcc" = yes; then
76 - cat >conftest.c <<EOF
77 -#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
81 - if ${CC-cc} -E conftest.c | egrep yes >/dev/null 2>&1; then
83 - echo "WARNING: gcc -O (version 2.4.5 and below) produces incorrect code"
84 - echo " for lpd.c and other large routines. Update your GCC compiler"
91 dnl ----------------------------------------------------------------------------
92 dnl ------------ OS Checks --------------------------------------------------
94 @@ -1322,38 +1262,9 @@
96 AC_MSG_RESULT(using $SHELL (FORCED))
101 - if test "${USE_NLS}" = yes; then
102 - AC_MSG_CHECKING([Using NLS, localedir ${LOCALEDIR}, ])
103 - if test "${USE_INCLUDED_LIBINTL}" = yes ; then
104 - AC_MSG_RESULT([using the local libintl installation])
105 - if test -f ${srcdir}/${nls_cv_header_libgt} ; then
106 - INTLINCS='-I $(top_builddir)/intl'
108 - AC_MSG_RESULT([NLS enabled, local libintl support is needed, and])
109 - AC_MSG_RESULT([ source code is not in the ${srcdir}/intl directory.])
110 - AC_MSG_RESULT([ See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details.])
114 - AC_MSG_RESULT([using -lintl])
118 - AC_MSG_RESULT([No NLS])
120 - if test "${USE_NLS}" != yes -o "${USE_INCLUDED_LIBINTL}" != yes ; then
121 - nls_cv_header_intl=
122 - nls_cv_header_libgt=
124 - if test "$XGETTEXT" = "" ; then
127 - AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
131 dnl ----------------------------------------------------------------------------
132 dnl ----------------- END OF GENERAL CONFIGURATION ---------------------------
134 @@ -1489,7 +1400,6 @@
142 @@ -1519,28 +1429,22 @@
150 -UTILS/accounting.pl \
151 -UTILS/decode_args_with_perl \
152 -UTILS/decode_args_with_sh \
157 -UTILS/lprm_in_perl \
158 -UTILS/make_lpd_conf \
159 -UTILS/make_printcap_use \
162 -UTILS/remote_active \
165 -; do chmod +x $i ; done
170 +UTILS/decode_args_with_perl
171 +UTILS/decode_args_with_sh
178 +UTILS/make_printcap_use
186 dnl ----------------------------------------------------------------------------
187 diff -Nru LPRng-3.7.2/man/Makefile.in LPRng-3.7.2.new/man/Makefile.in
188 --- LPRng-3.7.2/man/Makefile.in Thu Dec 21 20:42:25 2000
189 +++ LPRng-3.7.2.new/man/Makefile.in Thu Dec 21 20:41:40 2000
192 ## fix up prefix to be a make variable
199 # Install man pages in compressed form.
200 # COMPRESS = compression utility
203 for suffix in 1 2 3 4 5 6 7 8 ; do \
204 if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
205 - if [ ! -d $(DESTDIR)$(MAN)/man$${suffix} ] ; then \
206 - echo ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
207 - ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
208 + if [ ! -d $(DESTDIR)$(mandir)/man$${suffix} ] ; then \
209 + echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
210 + ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
212 for i in ${SRC}/*.$$suffix; do \
213 - echo $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
214 - $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
215 + echo $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
216 + $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
221 for suffix in 1 2 3 4 5 6 7 8 ; do \
222 if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
223 for i in ${SRC}/*.$$suffix; do \
224 - echo rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
225 - rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
226 + echo rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
227 + rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
231 diff -Nru LPRng-3.7.2/src/Makefile.in LPRng-3.7.2.new/src/Makefile.in
232 --- LPRng-3.7.2/src/Makefile.in Thu Dec 21 20:42:25 2000
233 +++ LPRng-3.7.2.new/src/Makefile.in Thu Dec 21 20:41:40 2000
237 # what C compiler to use.
242 # what command to use to "ranlib" or "lorder" the library.
248 -# loader for c programs
251 # any libs that need to be used to get these programs to compile:
252 LIBS=@INTLLIBS@ @LIBS@
254 -# add path to internationalization
266 CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ \
267 - -I.. -I${SRC}/include -I${SRC}/common @INTLINCS@ \
268 + -I.. -I${SRC}/include -I${SRC}/common \
269 -DCHOWN=\"@CHOWN@\" \
270 -DCHGRP=\"@CHGRP@\" \
271 -DPRINTCAP_PATH=\"@PRINTCAP_PATH@\" \
273 -DLOCKFILE=\"@LOCKFILE@\" \
274 -DCLEAR=\"@CLEAR@\" \
275 -DUSERID=\"@USERID@\" \
276 - -DGROUPID=\"@GROUPID@\" \
277 - -DLOCALEDIR=\"@LOCALEDIR@\"
279 + -DGROUPID=\"@GROUPID@\" \
280 + -DLOCALEDIR=\"$(datadir)/locale\"
282 USER_OBJS := @USER_OBJS@
284 FILTER_DIR = @FILTER_DIR@
289 #********************** End of configure modifiable settings ************
295 SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE
296 -INCLUDE=.. ${SRC}/include ${INTLINCS}
297 +INCLUDE=.. ${SRC}/include
299 VPATH=..:.:${SRC}/include:${SRC}/common
301 @@ -241,33 +231,33 @@
304 lpd: $(LPD_OBJS) liblpr.a
305 - $(LDCC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
306 + $(CC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
307 lpr: $(LPR_OBJS) liblpr.a
308 - $(LDCC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
309 + $(CC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
310 lpq: $(LPQ_OBJS) liblpr.a
311 - $(LDCC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
312 + $(CC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
313 lpstat: $(LPSTAT_OBJS) liblpr.a
314 - $(LDCC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
315 + $(CC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
316 lprm: $(LPRM_OBJS) liblpr.a
317 - $(LDCC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
318 + $(CC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
319 lpc: $(LPC_OBJS) liblpr.a
320 - $(LDCC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
321 + $(CC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
322 checkpc: $(CHECKPC_OBJS) liblpr.a
323 - $(LDCC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
324 + $(CC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
326 - $(LDCC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
327 + $(CC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
328 lpbanner: $(LPBANNER_OBJS)
329 - $(LDCC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
330 + $(CC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
331 monitor: $(MONITOR_OBJS) liblpr.a
332 - $(LDCC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
333 + $(CC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
335 authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh
336 rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@
338 sserver: sserver.o liblpr.a
339 - $(LDCC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
340 + $(CC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
341 sclient: sclient.o liblpr.a
342 - $(LDCC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
343 + $(CC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
345 sendauth.o lpd_secure.o : user_auth.stub
347 @@ -304,17 +294,17 @@
348 if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \
351 - ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
352 - ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
353 - ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
354 - ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
355 - ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
356 - ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
357 - ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
358 - ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
359 - ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
360 - ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
361 - ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
362 + ${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
363 + ${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
364 + ${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
365 + ${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
366 + ${INSTALLCMD} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
367 + ${INSTALLCMD} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
368 + ${INSTALLCMD} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
369 + ${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
370 + ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
371 + ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
372 + ${INSTALLCMD} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
373 cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;