1 --- LPRng-3.8.1/configure.in.orig Fri Nov 16 17:01:56 2001
2 +++ LPRng-3.8.1/configure.in Sun Nov 18 13:01:43 2001
4 dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
10 +AM_INIT_AUTOMAKE(LPRng, 3.8.0)
15 AC_CONFIG_HEADER(config.h)
17 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
18 -AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
28 -if test -z "$LOCALEDIR" ; then
29 - LOCALEDIR='${prefix}/share/locale'
34 -AC_PREFIX_DEFAULT(/usr/local)
36 -AC_SUBST(INSTALL_MAN)
48 -AC_PATH_PROG(PERL,perl)dnl
50 -AC_PATH_PROG(CHOWN,chown)dnl
52 -AC_PATH_PROG(CHGRP,chgrp)dnl
55 +AC_PATH_PROG(PERL,perl)
56 +AC_PATH_PROG(CHOWN,chown)
57 +AC_PATH_PROG(CHGRP,chgrp)
59 dnl ----------------------------------------------------------------------------
60 dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
62 AC_MSG_RESULT($FILTER_DIR)
65 -dnl default strip binaries
66 -AC_MSG_CHECKING(disable stripped binaries)
67 -AC_ARG_ENABLE( strip,
68 -[ --disable-strip disable stripping binaries by default],
70 -[v=yes; STRIP="-s"; ]
75 dnl ----------------------------------------------------------------------------
76 dnl ------------ OS Checks --------------------------------------------------
84 -release=`uname -r 2>/dev/null; exit 0`;
85 -version=`echo $target_os | sed -e 's/[^0-9][^0-9]*//' -e 's/\./X/' -e 's/\.//g' -e 's/X/./' \
86 - | awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
87 -if test "$version" -eq 0 ; then
88 - version=`echo $release | sed -e 's/-.*//' -e 's/\.//g' \
89 - | awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
91 -osword=`echo $target_os | sed -e 's/[0-9].*//'`; export osword
93 -AC_MSG_RESULT([Target is $target, arch $target_cpu, os $target_os, release $release, version $version])
95 -AC_DEFINE_UNQUOTED(ARCHITECTURE,"$target_cpu")
96 -AC_DEFINE_UNQUOTED(OSNAME,"$osword")
97 -AC_DEFINE_UNQUOTED(OSVERSION,$version)
101 -AC_SUBST(OSVERSION)dnl
104 dnl ----------------------------------------------------------------------------
105 dnl ----------- C compiler checks -----------------------------------------
110 -if test "$ac_cv_prog_gcc" = yes; then
111 - cat >conftest.c <<EOF
112 -#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
116 - if ${CC-cc} -E conftest.c | egrep yes >/dev/null 2>&1; then
118 - echo "WARNING: gcc -O (version 2.4.5 and below) produces incorrect code"
119 - echo " for lpd.c and other large routines. Update your GCC compiler"
130 AC_DEFINE(HAVE_QUAD_T)
134 -dnl ----------------------------------------------------------------------------
135 -dnl OS dependency checks
143 -changequote([, ])dnl
144 - AC_DEFINE(SETUID_CHECK)
145 - AC_MSG_WARN([Kernel may have SETUID compromise. Update kernel])
151 - dnl BSDI uses this for setproctitle
152 - AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
155 - dnl *BSD uses this for setproctitle
156 - AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
163 - AC_DEFINE_UNQUOTED(IRIX,$version)
167 - AC_DEFINE(HAVE_BROKEN_TIOCEXCL)
169 - AC_DEFINE_UNQUOTED(IRIX,$version)
173 - AC_DEFINE_UNQUOTED(IRIX,$version)
177 - AC_DEFINE_UNQUOTED(SOLARIS,$version)
181 - AC_DEFINE(_HPUX_SOURCE)
182 - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE=1"
183 - CFLAGS="$CFLAGS -D_HPUX_SOURCE=1"
184 - AC_DEFINE_UNQUOTED(HPUX,$version)
187 - AC_DEFINE_UNQUOTED(SUNOS,$version)
190 - AC_DEFINE_UNQUOTED(DECALPHA,$version)
191 - if test "$ac_cv_prog_gcc" != yes; then
192 - CPPFLAGS="$CPPFLAGS -std";
193 - CFLAGS="$CFLAGS -std";
195 - CPPFLAGS="$CPPFLAGS -DAES_SOURCE"
196 - CFLAGS="$CFLAGS -DAES_SOURCE"
202 -AC_MSG_RESULT([using CPPFLAGS=\"${CPPFLAGS}\", CFLAGS=\"${CFLAGS}\"])
204 dnl ----------------------------------------------------------------------------
208 dnl A/UX uses this...
209 AC_CHECK_LIB(posix, getpwent, [LIBS="$LIBS -lposix"])
211 - dnl use old-style shared libs if we have 'em.
212 AC_CHECK_LIB(socket_s, socket, [LIBS="$LIBS -lsocket_s"; have_socket=1], ,-lnsl)
213 if test -z "$have_socket"; then
214 AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"], , -lnsl)
216 dnl ----------------------------------------------------------------------------
217 dnl check to see if you have getpgrp(0) or getpgrp()
219 -dnl POSIX `getpgrp(void)' define HAVE_GETPGRP_0
220 -dnl BSD `getpgrp(int)' - takes 0 as argument
221 +dnl POSIX getpgrp(void) define HAVE_GETPGRP_0
222 +dnl BSD getpgrp(int) - takes 0 as argument
223 dnl define HAVE_GETPGRP_0 0
225 dnl check to see if you have getpgrp(0) or getpgrp()
226 @@ -1055,11 +901,11 @@
228 dnl ----------------------------------------------------------------------------
229 dnl just for (really) backwards compatibility
230 -dnl we really try not to use union wait -- it's heinously unportable.
231 +dnl we really try not to use union wait -- it is heinously unportable.
232 dnl nicked this check from Tcl as well. ;
234 dnl The check below checks whether <sys/wait.h> defines the type
235 -dnl "union wait" correctly. It's needed because of weirdness in
236 +dnl "union wait" correctly. It is needed because of weirdness in
237 dnl HP-UX where "union wait" is defined in both the BSD and SYS-V
238 dnl environments. Checking the usability of WIFEXITED seems to do
240 @@ -1307,41 +1153,9 @@
244 -dnl ----------------- force this to be Bourne Shell for now ---------------
245 -AC_MSG_CHECKING(for shell)
247 -AC_MSG_RESULT(using $SHELL (FORCED))
252 -AC_MSG_RESULT([LIBS $LIBS, INTLLIBS $INTLLIBS])
253 - if test "${USE_NLS}" = yes; then
254 - AC_MSG_RESULT([Using NLS, localedir ${LOCALEDIR}, need intl/libintl.a - "${USE_INCLUDED_LIBINTL}" ])
255 - if test "${USE_INCLUDED_LIBINTL}" = yes ; then
256 - CPPFLAGS="$CPPFLAGS -I \${top_builddir}/intl"
257 - AC_MSG_RESULT([using \${top_builddir}/intl])
258 - if test "$nls_cv_force_use_gnu_gettext" = no ; then
259 - echo "NLS enabled and requested system gettext support not available."
260 - echo " You may need to use:"
261 - echo " configure '--with-cppopts=-I/usr/local/include' '--with-ldopts=-L/usr/local/lib'"
262 - echo " See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
265 - if test ! -f ${srcdir}/intl/gettext.h ; then
266 - echo "gettext code is not in the ${srcdir}/intl directory."
267 - echo "See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
271 - LIBS="$INTLLIBS $LIBS"
273 - AC_MSG_RESULT([No NLS])
275 - if test "$XGETTEXT" = "" ; then
278 - AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
280 dnl ----------------------------------------------------------------------------
281 dnl ----------------- END OF GENERAL CONFIGURATION ---------------------------
283 @@ -1393,12 +1207,12 @@
285 if test "$found" = "" ; then
286 LIBS=" -lcrypto -lcom_err $SAVELIBS"
287 - AC_CHECKING(for krb5_des_string_to_key in $LIBS, )
288 + AC_MSG_NOTICE([for krb5_des_string_to_key in $LIBS])
289 AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
291 if test "$found" = "" ; then
292 LIBS=" -lk5crypto -lcom_err $SAVELIBS"
293 - AC_CHECKING(for krb5_des_string_to_keyin $LIBS, )
294 + AC_MSG_NOTICE([for krb5_des_string_to_keyin $LIBS])
295 AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
297 if test "$found" = "" ; then
298 @@ -1413,7 +1227,7 @@
300 if test "$found" = "" ; then
301 LIBS=" -lkrb5 $SAVELIBS"
302 - AC_CHECKING(for krb5_init_context in $LIBS, )
303 + AC_CHECKING([for krb5_init_context in $LIBS])
304 AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
306 if test "$found" = "" ; then
307 @@ -1427,12 +1241,12 @@
309 if test "$found" = "" ; then
310 LIBS=" -lkrb4 -ldes425 $SAVELIBS"
311 - AC_CHECKING(for krb_recvauth in $LIBS, )
312 + AC_CHECKING([for krb_recvauth in $LIBS])
313 AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
315 if test "$found" = "" ; then
316 LIBS=" -lkrb4 -ldes $SAVELIBS"
317 - AC_CHECKING(for krb_recvauth in $LIBS, )
318 + AC_CHECKING([for krb_recvauth in $LIBS])
319 AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
321 if test "$found" = "" ; then
322 @@ -1501,12 +1315,7 @@
323 dnl ----------------- START OF OUTPUT ------------------------------------------
326 -if test "$ac_cv_prog_gcc" = yes; then
327 - CFLAGS="$CFLAGS -Wall -Werror"
336 @@ -1535,29 +1344,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.1/src/Makefile.in~ Fri Nov 16 17:01:32 2001
384 +++ LPRng-3.8.1/src/Makefile.in Sun Nov 18 23:24:17 2001
389 -# loader for c programs
392 # any libs that need to be used to get these programs to compile:
403 -I${SRC}/include -I${SRC}/common \
405 FILTER_DIR = @FILTER_DIR@
410 #********************** End of configure modifiable settings ************
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 @@ -310,17 +306,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.1/Makefile.in~ Mon Nov 19 00:56:23 2001
452 +++ LPRng-3.8.1/Makefile.in Mon Nov 19 00:56:23 2001
454 LOCKFILE=\"@LOCKFILE@\"
455 PSHOWALL="@PSHOWALL@"
456 FILTER_DIR=@FILTER_DIR@
457 -LOCALEDIR=@LOCALEDIR@
466 ###############################################################################
468 - if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
469 - cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
470 - DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
474 -$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS)
477 -rm -f *.bak ? ?.* core *.old
480 - $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS)
481 + for i in $(INSTALLDIRS); do \
482 + $(MAKE) install DESTDIR=$(DESTDIR) -C $$i; \
485 if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \
486 MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \