1 --- LPRng-3.8.12/configure.in.orig Mon May 6 18:00:12 2002
2 +++ LPRng-3.8.12/configure.in Wed Jul 10 00:25:05 2002
4 dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
11 +AM_INIT_AUTOMAKE(LPRng, 3.8.12)
15 AC_CONFIG_HEADER(config.h)
17 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
18 -AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
27 -if test -z "$LOCALEDIR" ; then
28 - LOCALEDIR='${prefix}/share/locale'
33 -AC_PREFIX_DEFAULT(/usr/local)
35 -AC_SUBST(INSTALL_MAN)
47 -AC_PATH_PROG(PERL,perl)dnl
49 -AC_PATH_PROG(CHOWN,chown)dnl
51 -AC_PATH_PROG(CHGRP,chgrp)dnl
53 -AC_PATH_PROG(PRUTIL,pr)dnl
56 +AC_PATH_PROG(PERL,perl)
57 +AC_PATH_PROG(CHOWN,chown)
58 +AC_PATH_PROG(CHGRP,chgrp)
59 +AC_PATH_PROG(PRUTIL,pe)
61 dnl ----------------------------------------------------------------------------
62 dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
64 AC_MSG_RESULT($FILTER_DIR)
67 -dnl default strip binaries
68 -AC_MSG_CHECKING(disable stripped binaries)
69 -AC_ARG_ENABLE( strip,
70 -[ --disable-strip disable stripping binaries by default],
71 -[v=no; STRIP_OPTION=""; ],
72 -[v=yes; STRIP_OPTION=" -s "; ]
75 -AC_SUBST(STRIP_OPTION)
77 dnl ----------------------------------------------------------------------------
78 dnl ------------ OS Checks --------------------------------------------------
86 -release=`uname -r 2>/dev/null; exit 0`;
87 -version=`echo $target_os | sed -e 's/[^0-9][^0-9]*//' -e 's/\./X/' -e 's/\.//g' -e 's/X/./' \
88 - | awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
89 -if test "$version" -eq 0 ; then
90 - version=`echo $release | sed -e 's/-.*//' -e 's/\.//g' \
91 - | awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
93 -osword=`echo $target_os | sed -e 's/[0-9].*//'`; export osword
95 -AC_MSG_RESULT([Target is $target, arch $target_cpu, os $target_os, release $release, version $version])
97 -AC_DEFINE_UNQUOTED(ARCHITECTURE,"$target_cpu")
98 -AC_DEFINE_UNQUOTED(OSNAME,"$osword")
99 -AC_DEFINE_UNQUOTED(OSVERSION,$version)
103 -AC_SUBST(OSVERSION)dnl
106 dnl ----------------------------------------------------------------------------
107 dnl ----------- C compiler checks -----------------------------------------
112 -if test "$ac_cv_prog_gcc" = yes; then
113 - cat >conftest.c <<EOF
114 -#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
118 - if ${CC-cc} -E conftest.c | egrep yes >/dev/null 2>&1; then
120 - echo "WARNING: gcc -O (version 2.4.5 and below) produces incorrect code"
121 - echo " for lpd.c and other large routines. Update your GCC compiler"
132 AC_DEFINE(HAVE_QUAD_T)
136 -dnl ----------------------------------------------------------------------------
137 -dnl OS dependency checks
145 -changequote([, ])dnl
146 - AC_DEFINE(SETUID_CHECK)
147 - AC_MSG_WARN([Kernel may have SETUID compromise. Update kernel])
153 - dnl BSDI uses this for setproctitle
154 - AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
157 - dnl *BSD uses this for setproctitle
158 - AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
165 - AC_DEFINE_UNQUOTED(IRIX,$version)
169 - AC_DEFINE(HAVE_BROKEN_TIOCEXCL)
171 - AC_DEFINE_UNQUOTED(IRIX,$version)
175 - AC_DEFINE_UNQUOTED(IRIX,$version)
179 - AC_DEFINE_UNQUOTED(SOLARIS,$version)
183 - AC_DEFINE(_HPUX_SOURCE)
184 - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE=1"
185 - CFLAGS="$CFLAGS -D_HPUX_SOURCE=1"
186 - AC_DEFINE_UNQUOTED(HPUX,$version)
189 - AC_DEFINE_UNQUOTED(SUNOS,$version)
192 - AC_DEFINE_UNQUOTED(DECALPHA,$version)
193 - if test "$ac_cv_prog_gcc" != yes; then
194 - CPPFLAGS="$CPPFLAGS -std";
195 - CFLAGS="$CFLAGS -std";
197 - CPPFLAGS="$CPPFLAGS -DAES_SOURCE"
198 - CFLAGS="$CFLAGS -DAES_SOURCE"
204 -AC_MSG_RESULT([using CPPFLAGS=\"${CPPFLAGS}\", CFLAGS=\"${CFLAGS}\"])
206 dnl ----------------------------------------------------------------------------
210 dnl A/UX uses this...
211 AC_CHECK_LIB(posix, getpwent, [LIBS="$LIBS -lposix"])
213 - dnl use old-style shared libs if we have 'em.
214 AC_CHECK_LIB(socket_s, socket, [LIBS="$LIBS -lsocket_s"; have_socket=1], ,-lnsl)
215 if test -z "$have_socket"; then
216 AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"], , -lnsl)
218 dnl ----------------------------------------------------------------------------
219 dnl check to see if you have getpgrp(0) or getpgrp()
221 -dnl POSIX `getpgrp(void)' define HAVE_GETPGRP_0
222 -dnl BSD `getpgrp(int)' - takes 0 as argument
223 +dnl POSIX getpgrp(void) define HAVE_GETPGRP_0
224 +dnl BSD getpgrp(int) - takes 0 as argument
225 dnl define HAVE_GETPGRP_0 0
227 dnl check to see if you have getpgrp(0) or getpgrp()
228 @@ -1090,11 +933,11 @@
230 dnl ----------------------------------------------------------------------------
231 dnl just for (really) backwards compatibility
232 -dnl we really try not to use union wait -- it's heinously unportable.
233 +dnl we really try not to use union wait -- it is heinously unportable.
234 dnl nicked this check from Tcl as well. ;
236 dnl The check below checks whether <sys/wait.h> defines the type
237 -dnl "union wait" correctly. It's needed because of weirdness in
238 +dnl "union wait" correctly. It is needed because of weirdness in
239 dnl HP-UX where "union wait" is defined in both the BSD and SYS-V
240 dnl environments. Checking the usability of WIFEXITED seems to do
242 @@ -1342,41 +1185,9 @@
246 -dnl ----------------- force this to be Bourne Shell for now ---------------
247 -AC_MSG_CHECKING(for shell)
249 -AC_MSG_RESULT(using $SHELL (FORCED))
254 -AC_MSG_RESULT([LIBS $LIBS, INTLLIBS $INTLLIBS])
255 - if test "${USE_NLS}" = yes; then
256 - AC_MSG_RESULT([Using NLS, localedir ${LOCALEDIR}, need intl/libintl.a - "${USE_INCLUDED_LIBINTL}" ])
257 - if test "${USE_INCLUDED_LIBINTL}" = yes ; then
258 - CPPFLAGS="$CPPFLAGS -I \${top_builddir}/intl"
259 - AC_MSG_RESULT([using \${top_builddir}/intl])
260 - if test "$nls_cv_force_use_gnu_gettext" = no ; then
261 - echo "NLS enabled and requested system gettext support not available."
262 - echo " You may need to use:"
263 - echo " configure '--with-cppopts=-I/usr/local/include' '--with-ldopts=-L/usr/local/lib'"
264 - echo " See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
267 - if test ! -f ${srcdir}/intl/gettext.h ; then
268 - echo "gettext code is not in the ${srcdir}/intl directory."
269 - echo "See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
273 - LIBS="$INTLLIBS $LIBS"
275 - AC_MSG_RESULT([No NLS])
277 - if test "$XGETTEXT" = "" ; then
280 - AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
282 dnl ----------------------------------------------------------------------------
283 dnl ----------------- END OF GENERAL CONFIGURATION ---------------------------
285 @@ -1454,12 +1265,12 @@
287 if test "$found" = "" ; then
288 LIBS=" -lcrypto -lcom_err $SAVELIBS"
289 - AC_CHECKING(for krb5_des_string_to_key in $LIBS, )
290 + AC_MSG_NOTICE([for krb5_des_string_to_key in $LIBS])
291 AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
293 if test "$found" = "" ; then
294 LIBS=" -lk5crypto -lcom_err $SAVELIBS"
295 - AC_CHECKING(for krb5_des_string_to_keyin $LIBS, )
296 + AC_MSG_NOTICE([for krb5_des_string_to_keyin $LIBS])
297 AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
299 if test "$found" = "" ; then
300 @@ -1474,7 +1285,7 @@
302 if test "$found" = "" ; then
303 LIBS=" -lkrb5 $SAVELIBS"
304 - AC_CHECKING(for krb5_init_context in $LIBS, )
305 + AC_CHECKING([for krb5_init_context in $LIBS])
306 AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
308 if test "$found" = "" ; then
309 @@ -1488,12 +1299,12 @@
311 if test "$found" = "" ; then
312 LIBS=" -lkrb4 -ldes425 $SAVELIBS"
313 - AC_CHECKING(for krb_recvauth in $LIBS, )
314 + AC_CHECKING([for krb_recvauth in $LIBS])
315 AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
317 if test "$found" = "" ; then
318 LIBS=" -lkrb4 -ldes $SAVELIBS"
319 - AC_CHECKING(for krb_recvauth in $LIBS, )
320 + AC_CHECKING([for krb_recvauth in $LIBS])
321 AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
323 if test "$found" = "" ; then
324 @@ -1562,11 +1373,6 @@
325 dnl ----------------- START OF OUTPUT ------------------------------------------
328 -if test "$ac_cv_prog_gcc" = yes; then
329 - CFLAGS="$CFLAGS -g -W -Wall -Werror -Wno-unused "
330 - CPPFLAGS="$CPPFLAGS -g -W -Wall -Werror -Wno-unused "
336 @@ -1597,29 +1403,23 @@
344 -UTILS/accounting.pl \
345 -UTILS/decode_args_with_perl \
346 -UTILS/decode_args_with_sh \
351 -UTILS/lprm_in_perl \
352 -UTILS/make_lpd_conf \
353 -UTILS/make_printcap_use \
356 -UTILS/remote_active \
359 -; do chmod +x $i ; done
365 +UTILS/decode_args_with_perl
366 +UTILS/decode_args_with_sh
373 +UTILS/make_printcap_use
381 dnl ----------------------------------------------------------------------------
382 dnl ----------------- END OF OUTPUT --------------------------------------------
383 --- LPRng-3.8.12/src/Makefile.in.orig Mon May 6 17:26:46 2002
384 +++ LPRng-3.8.12/src/Makefile.in Wed Jul 10 00:14:35 2002
389 -# loader for c programs
392 # any libs that need to be used to get these programs to compile:
399 -STRIP=@STRIP_OPTION@
403 -I${SRC}/include -I${SRC}/common \
405 -DCLEAR=\"@CLEAR@\" \
406 -DUSERID=\"@USERID@\" \
407 -DGROUPID=\"@GROUPID@\" \
408 - -DLOCALEDIR=\"@LOCALEDIR@\" \
409 + -DLOCALEDIR=\"${datdadir}\locale\" \
410 -DDONE_JOBS=\"@DONE_JOBS@\" \
411 -DDONE_JOBS_MAX_AGE=\"@DONE_JOBS_MAX_AGE@\" \
412 -DUNIXSOCKETPATH=\"@UNIXSOCKETPATH@\" \
414 ########################################################################
417 -LINK = $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@
418 +LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@
420 $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
422 @@ -317,17 +312,17 @@
425 ${LIBTOOL} --mode=install $(INSTALLCMD) liblpr.la $(DESTDIR)$(libdir)/liblpr.la
426 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
427 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
428 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
429 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
430 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
431 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
432 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
433 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
434 - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
435 - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
436 - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
437 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
438 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
439 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
440 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
441 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
442 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
443 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
444 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
445 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
446 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
447 + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
448 cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
451 --- LPRng-3.8.12/Makefile.in.orig Wed Apr 10 18:45:43 2002
452 +++ LPRng-3.8.12/Makefile.in Tue Jul 9 23:59:48 2002
454 LOCKFILE=\"@LOCKFILE@\"
455 PSHOWALL="@PSHOWALL@"
456 FILTER_DIR=@FILTER_DIR@
457 -LOCALEDIR=@LOCALEDIR@
462 #=============================================================================
463 # List the directories you want to generate:
467 ###############################################################################
469 - if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
470 - cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
471 - DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
475 -$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS)
478 -rm -f *.bak ? ?.* core *.old
481 - $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS)
482 + for i in $(INSTALLDIRS); do \
483 + $(MAKE) install DESTDIR=$(DESTDIR) -C $$i; \
486 if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \
487 MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \