1 diff -Nru LPRng-3.8.0/Makefile.in LPRng-3.8.0.new/Makefile.in
2 --- LPRng-3.8.0/Makefile.in Tue Oct 16 22:09:21 2001
3 +++ LPRng-3.8.0.new/Makefile.in Tue Oct 23 11:08:12 2001
5 LOCKFILE=\"@LOCKFILE@\"
7 FILTER_DIR=@FILTER_DIR@
13 ###############################################################################
15 if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
16 - cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
18 DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
21 --- LPRng-3.8.0/configure.in~ Tue Oct 16 22:27:47 2001
22 +++ LPRng-3.8.0/configure.in Tue Oct 23 16:08:57 2001
33 AC_CONFIG_HEADER(config.h)
35 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
36 -AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
46 -if test -z "$LOCALEDIR" ; then
47 - LOCALEDIR='${prefix}/share/locale'
52 -AC_PREFIX_DEFAULT(/usr/local)
54 -AC_SUBST(INSTALL_MAN)
62 +AM_INIT_AUTOMAKE(LPRng, 3.8.0)
67 -AC_PATH_PROG(PERL,perl)dnl
69 -AC_PATH_PROG(CHOWN,chown)dnl
71 -AC_PATH_PROG(CHGRP,chgrp)dnl
74 +AC_PATH_PROG(PERL,perl)
75 +AC_PATH_PROG(CHOWN,chown)
76 +AC_PATH_PROG(CHGRP,chgrp)
78 dnl ----------------------------------------------------------------------------
79 dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
81 AC_MSG_RESULT($FILTER_DIR)
84 -dnl default strip binaries
85 -AC_MSG_CHECKING(disable stripped binaries)
86 -AC_ARG_ENABLE( strip,
87 -[ --disable-strip disable stripping binaries by default],
89 -[v=yes; STRIP="-s"; ]
94 dnl ----------------------------------------------------------------------------
95 dnl ------------ OS Checks --------------------------------------------------
103 -release=`uname -r 2>/dev/null; exit 0`;
104 -version=`echo $target_os | sed -e 's/[^0-9][^0-9]*//' -e 's/\./X/' -e 's/\.//g' -e 's/X/./' \
105 - | awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
106 -if test "$version" -eq 0 ; then
107 - version=`echo $release | sed -e 's/-.*//' -e 's/\.//g' \
108 - | awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
110 -osword=`echo $target_os | sed -e 's/[0-9].*//'`; export osword
111 -changequote([, ])dnl
112 -AC_MSG_RESULT([Target is $target, arch $target_cpu, os $target_os, release $release, version $version])
114 -AC_DEFINE_UNQUOTED(ARCHITECTURE,"$target_cpu")
115 -AC_DEFINE_UNQUOTED(OSNAME,"$osword")
116 -AC_DEFINE_UNQUOTED(OSVERSION,$version)
120 -AC_SUBST(OSVERSION)dnl
123 dnl ----------------------------------------------------------------------------
124 dnl ----------- C compiler checks -----------------------------------------
129 -if test "$ac_cv_prog_gcc" = yes; then
130 - cat >conftest.c <<EOF
131 -#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
135 - if ${CC-cc} -E conftest.c | egrep yes >/dev/null 2>&1; then
137 - echo "WARNING: gcc -O (version 2.4.5 and below) produces incorrect code"
138 - echo " for lpd.c and other large routines. Update your GCC compiler"
149 AC_DEFINE(HAVE_QUAD_T)
153 -dnl ----------------------------------------------------------------------------
154 -dnl OS dependency checks
162 -changequote([, ])dnl
163 - AC_DEFINE(SETUID_CHECK)
164 - AC_MSG_WARN([Kernel may have SETUID compromise. Update kernel])
170 - dnl BSDI uses this for setproctitle
171 - AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
174 - dnl *BSD uses this for setproctitle
175 - AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
182 - AC_DEFINE_UNQUOTED(IRIX,$version)
186 - AC_DEFINE(HAVE_BROKEN_TIOCEXCL)
188 - AC_DEFINE_UNQUOTED(IRIX,$version)
192 - AC_DEFINE_UNQUOTED(IRIX,$version)
196 - AC_DEFINE_UNQUOTED(SOLARIS,$version)
200 - AC_DEFINE(_HPUX_SOURCE)
201 - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE=1"
202 - CFLAGS="$CFLAGS -D_HPUX_SOURCE=1"
203 - AC_DEFINE_UNQUOTED(HPUX,$version)
206 - AC_DEFINE_UNQUOTED(SUNOS,$version)
209 - AC_DEFINE_UNQUOTED(DECALPHA,$version)
210 - if test "$ac_cv_prog_gcc" != yes; then
211 - CPPFLAGS="$CPPFLAGS -std";
212 - CFLAGS="$CFLAGS -std";
214 - CPPFLAGS="$CPPFLAGS -DAES_SOURCE"
215 - CFLAGS="$CFLAGS -DAES_SOURCE"
221 -AC_MSG_RESULT([using CPPFLAGS=\"${CPPFLAGS}\", CFLAGS=\"${CFLAGS}\"])
223 dnl ----------------------------------------------------------------------------
227 dnl A/UX uses this...
228 AC_CHECK_LIB(posix, getpwent, [LIBS="$LIBS -lposix"])
230 - dnl use old-style shared libs if we have 'em.
231 AC_CHECK_LIB(socket_s, socket, [LIBS="$LIBS -lsocket_s"; have_socket=1], ,-lnsl)
232 if test -z "$have_socket"; then
233 AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"], , -lnsl)
235 dnl ----------------------------------------------------------------------------
236 dnl check to see if you have getpgrp(0) or getpgrp()
238 -dnl POSIX `getpgrp(void)' define HAVE_GETPGRP_0
239 -dnl BSD `getpgrp(int)' - takes 0 as argument
240 +dnl POSIX getpgrp(void) define HAVE_GETPGRP_0
241 +dnl BSD getpgrp(int) - takes 0 as argument
242 dnl define HAVE_GETPGRP_0 0
244 dnl check to see if you have getpgrp(0) or getpgrp()
245 @@ -1055,11 +899,11 @@
247 dnl ----------------------------------------------------------------------------
248 dnl just for (really) backwards compatibility
249 -dnl we really try not to use union wait -- it's heinously unportable.
250 +dnl we really try not to use union wait -- it is heinously unportable.
251 dnl nicked this check from Tcl as well. ;
253 dnl The check below checks whether <sys/wait.h> defines the type
254 -dnl "union wait" correctly. It's needed because of weirdness in
255 +dnl "union wait" correctly. It is needed because of weirdness in
256 dnl HP-UX where "union wait" is defined in both the BSD and SYS-V
257 dnl environments. Checking the usability of WIFEXITED seems to do
259 @@ -1307,41 +1151,9 @@
263 -dnl ----------------- force this to be Bourne Shell for now ---------------
264 -AC_MSG_CHECKING(for shell)
266 -AC_MSG_RESULT(using $SHELL (FORCED))
271 -AC_MSG_RESULT([LIBS $LIBS, INTLLIBS $INTLLIBS])
272 - if test "${USE_NLS}" = yes; then
273 - AC_MSG_RESULT([Using NLS, localedir ${LOCALEDIR}, need intl/libintl.a - "${USE_INCLUDED_LIBINTL}" ])
274 - if test "${USE_INCLUDED_LIBINTL}" = yes ; then
275 - CPPFLAGS="$CPPFLAGS -I \${top_builddir}/intl"
276 - AC_MSG_RESULT([using \${top_builddir}/intl])
277 - if test "$nls_cv_force_use_gnu_gettext" = no ; then
278 - echo "NLS enabled and requested system gettext support not available."
279 - echo " You may need to use:"
280 - echo " configure '--with-cppopts=-I/usr/local/include' '--with-ldopts=-L/usr/local/lib'"
281 - echo " See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
284 - if test ! -f ${srcdir}/intl/gettext.h ; then
285 - echo "gettext code is not in the ${srcdir}/intl directory."
286 - echo "See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
290 - LIBS="$INTLLIBS $LIBS"
292 - AC_MSG_RESULT([No NLS])
294 - if test "$XGETTEXT" = "" ; then
297 - AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
299 dnl ----------------------------------------------------------------------------
300 dnl ----------------- END OF GENERAL CONFIGURATION ---------------------------
302 @@ -1393,12 +1205,12 @@
304 if test "$found" = "" ; then
305 LIBS=" -lcrypto -lcom_err $SAVELIBS"
306 - AC_CHECKING(for krb5_des_string_to_key in $LIBS, )
307 + AC_MSG_NOTICE([for krb5_des_string_to_key in $LIBS])
308 AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
310 if test "$found" = "" ; then
311 LIBS=" -lk5crypto -lcom_err $SAVELIBS"
312 - AC_CHECKING(for krb5_des_string_to_keyin $LIBS, )
313 + AC_MSG_NOTICE([for krb5_des_string_to_keyin $LIBS])
314 AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
316 if test "$found" = "" ; then
317 @@ -1413,7 +1225,7 @@
319 if test "$found" = "" ; then
320 LIBS=" -lkrb5 $SAVELIBS"
321 - AC_CHECKING(for krb5_init_context in $LIBS, )
322 + AC_CHECKING([for krb5_init_context in $LIBS])
323 AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
325 if test "$found" = "" ; then
326 @@ -1427,12 +1239,12 @@
328 if test "$found" = "" ; then
329 LIBS=" -lkrb4 -ldes425 $SAVELIBS"
330 - AC_CHECKING(for krb_recvauth in $LIBS, )
331 + AC_CHECKING([for krb_recvauth in $LIBS])
332 AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
334 if test "$found" = "" ; then
335 LIBS=" -lkrb4 -ldes $SAVELIBS"
336 - AC_CHECKING(for krb_recvauth in $LIBS, )
337 + AC_CHECKING([for krb_recvauth in $LIBS])
338 AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
340 if test "$found" = "" ; then
341 @@ -1501,12 +1313,7 @@
342 dnl ----------------- START OF OUTPUT ------------------------------------------
345 -if test "$ac_cv_prog_gcc" = yes; then
346 - CFLAGS="$CFLAGS -Wall -Werror"
355 @@ -1535,29 +1342,23 @@
363 -UTILS/accounting.pl \
364 -UTILS/decode_args_with_perl \
365 -UTILS/decode_args_with_sh \
370 -UTILS/lprm_in_perl \
371 -UTILS/make_lpd_conf \
372 -UTILS/make_printcap_use \
375 -UTILS/remote_active \
378 -; do chmod +x $i ; done
384 +UTILS/decode_args_with_perl
385 +UTILS/decode_args_with_sh
392 +UTILS/make_printcap_use
400 dnl ----------------------------------------------------------------------------
401 dnl ----------------- END OF OUTPUT --------------------------------------------
402 --- LPRng-3.8.0/man/Makefile.in Sat Aug 25 20:10:01 2001
403 +++ LPRng-3.8.0.new/man/Makefile.in Tue Oct 23 11:08:12 2001
406 ## fix up prefix to be a make variable
413 # Install man pages in compressed form.
414 # COMPRESS = compression utility
417 for suffix in 1 2 3 4 5 6 7 8 ; do \
418 if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
419 - if [ ! -d $(DESTDIR)$(MAN)/man$${suffix} ] ; then \
420 - echo ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
421 - ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
422 + if [ ! -d $(DESTDIR)$(mandir)/man$${suffix} ] ; then \
423 + echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
424 + ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
426 for i in ${SRC}/*.$$suffix; do \
427 - echo $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
428 - $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
429 + echo $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
430 + $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
435 for suffix in 1 2 3 4 5 6 7 8 ; do \
436 if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
437 for i in ${SRC}/*.$$suffix; do \
438 - echo rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
439 - rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
440 + echo rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
441 + rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
445 --- LPRng-3.8.0/src/Makefile.in~ Sat Aug 25 20:02:01 2001
446 +++ LPRng-3.8.0/src/Makefile.in Tue Oct 23 20:41:57 2001
450 # what C compiler to use.
455 # what command to use to "ranlib" or "lorder" the library.
461 -# loader for c programs
464 # any libs that need to be used to get these programs to compile:
475 -I${SRC}/include -I${SRC}/common \
477 -DCLEAR=\"@CLEAR@\" \
478 -DUSERID=\"@USERID@\" \
479 -DGROUPID=\"@GROUPID@\" \
480 - -DLOCALEDIR=\"@LOCALEDIR@\"
481 + -DLOCALEDIR=\"$(datadir)/locale\"
483 USER_OBJS := @USER_OBJS@
486 FILTER_DIR = @FILTER_DIR@
491 #********************** End of configure modifiable settings ************
495 ########################################################################
498 -LINK = $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@
499 +LINK = $(LIBTOOL) --mode=link $(CC) -o $@
501 $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
503 @@ -249,25 +243,25 @@
504 $(LINK) $(LIBLPR_OBJS) -rpath ${libdir}
506 lpd: $(LPD_OBJS) liblpr.la
507 - $(LINK) ${LPD_OBJS} liblpr.la $(LIBS)
508 + $(LINK) $(LDFLAGS) ${LPD_OBJS} liblpr.la $(LIBS)
509 lpr: $(LPR_OBJS) liblpr.la
510 - $(LINK) ${LPR_OBJS} liblpr.la $(LIBS)
511 + $(LINK) $(LDFLAGS) ${LPR_OBJS} liblpr.la $(LIBS)
512 lpq: $(LPQ_OBJS) liblpr.la
513 - $(LINK) ${LPQ_OBJS} liblpr.la $(LIBS)
514 + $(LINK) $(LDFLAGS) ${LPQ_OBJS} liblpr.la $(LIBS)
515 lpstat: $(LPSTAT_OBJS) liblpr.la
516 - $(LINK) ${LPSTAT_OBJS} liblpr.la $(LIBS)
517 + $(LINK) $(LDFLAGS) ${LPSTAT_OBJS} liblpr.la $(LIBS)
518 lprm: $(LPRM_OBJS) liblpr.la
519 - $(LINK) ${LPRM_OBJS} liblpr.la $(LIBS)
520 + $(LINK) $(LDFLAGS) ${LPRM_OBJS} liblpr.la $(LIBS)
521 lpc: $(LPC_OBJS) liblpr.la
522 - $(LINK) ${LPC_OBJS} liblpr.la $(LIBS)
523 + $(LINK) $(LDFLAGS) ${LPC_OBJS} liblpr.la $(LIBS)
524 checkpc: $(CHECKPC_OBJS) liblpr.la
525 - $(LINK) ${CHECKPC_OBJS} liblpr.la $(LIBS)
526 + $(LINK) $(LDFLAGS) ${CHECKPC_OBJS} liblpr.la $(LIBS)
528 - $(LINK) ${LPF_OBJS} $(LIBS)
529 + $(LINK) $(LDFLAGS) ${LPF_OBJS} $(LIBS)
530 lpbanner: $(LPBANNER_OBJS)
531 - $(LINK) ${LPBANNER_OBJS} $(LIBS)
532 + $(LINK) $(LDFLAGS) ${LPBANNER_OBJS} $(LIBS)
533 monitor: $(MONITOR_OBJS) liblpr.la
534 - $(LINK) ${MONITOR_OBJS} liblpr.la $(LIBS)
535 + $(LINK) $(LDFLAGS) ${MONITOR_OBJS} liblpr.la $(LIBS)
537 authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh
538 rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@
539 @@ -313,17 +307,17 @@
542 ${LIBTOOL} --mode=install $(INSTALLCMD) liblpr.la $(DESTDIR)$(libdir)/liblpr.la
543 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
544 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
545 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
546 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
547 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
548 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
549 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
550 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
551 - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
552 - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
553 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
554 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
555 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
556 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
557 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
558 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
559 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
560 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
561 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
562 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
563 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
564 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
565 cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;