[packages/LPRng.git] / LPRng-ac_fixes.patch

--- LPRng-3.8.1/configure.in.orig	Fri Nov 16 17:01:56 2001
+++ LPRng-3.8.1/configure.in	Sun Nov 18 13:01:43 2001
@@ -6,53 +6,19 @@
 dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
 AC_INIT(Makefile.in)
 
-
-PACKAGE=LPRng
-VERSION=3.8.1
+AM_INIT_AUTOMAKE(LPRng, 3.8.0)
 
 
 AC_CONFIG_AUX_DIR(.)
-AC_CANONICAL_SYSTEM
 AC_CONFIG_HEADER(config.h)
 
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
 ALL_LINGUAS="fr"
 
-WITH_CC dnl
-WITH_CCOPTS dnl
-WITH_LINKER dnl
-WITH_LDOPTS dnl
-WITH_CPPOPTS dnl
-if test -z "$LOCALEDIR" ; then
-    LOCALEDIR='${prefix}/share/locale'
-fi;
-WITH_LOCALEDIR dnl
-export LOCALEDIR
-
-AC_PREFIX_DEFAULT(/usr/local)
-AC_SUBST(INSTALL)
-AC_SUBST(INSTALL_MAN)
-AC_SUBST(SHELL)
-AC_SUBST(CPP)
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(LDCC)
-
-
 dnl check for awk
 AC_PROG_AWK
-AC_SUBST(AWK)
-AC_PATH_PROG(PERL,perl)dnl
-AC_SUBST(PERL)dnl
-AC_PATH_PROG(CHOWN,chown)dnl
-AC_SUBST(CHOWN)dnl
-AC_PATH_PROG(CHGRP,chgrp)dnl
-AC_SUBST(CHGRP)dnl
-
+AC_PATH_PROG(PERL,perl)
+AC_PATH_PROG(CHOWN,chown)
+AC_PATH_PROG(CHGRP,chgrp)
 
 dnl ----------------------------------------------------------------------------
 dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
@@ -333,16 +299,6 @@
 AC_MSG_RESULT($FILTER_DIR)
 AC_SUBST(FILTER_DIR)
 
-dnl default strip binaries 
-AC_MSG_CHECKING(disable stripped binaries)
-AC_ARG_ENABLE( strip,
-[  --disable-strip                   disable stripping binaries by default],
-[v=no; STRIP=""; ],
-[v=yes;  STRIP="-s"; ]
-)
-AC_MSG_RESULT($v)
-AC_SUBST(STRIP)
-
 dnl ----------------------------------------------------------------------------
 dnl ------------   OS Checks  --------------------------------------------------
 
@@ -350,50 +306,12 @@
 AC_MINIX
 AC_AIX
 
-
-changequote(, )dnl
-release=`uname -r 2>/dev/null; exit 0`;
-version=`echo $target_os | sed -e 's/[^0-9][^0-9]*//' -e 's/\./X/' -e 's/\.//g' -e 's/X/./' \
-	| awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
-if test "$version" -eq 0 ; then
-	version=`echo $release | sed -e 's/-.*//' -e 's/\.//g' \
-	| awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
-fi
-osword=`echo $target_os | sed -e 's/[0-9].*//'`; export osword
-changequote([, ])dnl
-AC_MSG_RESULT([Target is $target, arch $target_cpu, os $target_os, release $release, version $version])
-
-AC_DEFINE_UNQUOTED(ARCHITECTURE,"$target_cpu")
-AC_DEFINE_UNQUOTED(OSNAME,"$osword")
-AC_DEFINE_UNQUOTED(OSVERSION,$version)
-OSNAME=$osword
-OSVERSION=$version
-AC_SUBST(OSNAME)dnl
-AC_SUBST(OSVERSION)dnl
-
-
 dnl ----------------------------------------------------------------------------
 dnl -----------   C compiler checks    -----------------------------------------
 
 AC_PROG_CPP
 AC_PROG_CC
 
-if test "$ac_cv_prog_gcc" = yes; then
-	cat >conftest.c <<EOF
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
-yes
-#endif
-EOF
-    if ${CC-cc} -E conftest.c | egrep yes >/dev/null 2>&1; then
-        gcc -v
-		echo "WARNING: gcc -O (version 2.4.5 and below) produces incorrect code"
-		echo "  for lpd.c and other large routines. Update your GCC compiler"
-		exit 1
-	fi;
-fi;
-
-LDCC="$CC"
-
 AM_PROG_LIBTOOL
 
 AC_C_CONST
@@ -451,77 +369,6 @@
   AC_DEFINE(HAVE_QUAD_T)
 fi
 
-
-dnl ----------------------------------------------------------------------------
-dnl OS dependency checks
-checklibs=
-case $target_os in
-	 *linux* )
-		no_resolv_lib=yes;
-		case $release in
-changequote(, )dnl
-		2.2.1[0-5]* )
-changequote([, ])dnl
-			AC_DEFINE(SETUID_CHECK)
-			AC_MSG_WARN([Kernel may have SETUID compromise.  Update kernel])
-			;;
-		esac
-		;;
-	 *bsdi* )
-		LDCC=shlicc
-		dnl BSDI uses this for setproctitle
-		AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
-		;;
-	 *bsd* )
-		dnl *BSD uses this for setproctitle
-		AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
-		;;
-	 *unicos* )
-		checklibs=no
-		;;
-	 *irix6* )
-		checklibs=no
-		AC_DEFINE_UNQUOTED(IRIX,$version)
-		;;
-	 *irix5* )
-		checklibs=no
-		AC_DEFINE(HAVE_BROKEN_TIOCEXCL)
-		AC_DEFINE(SVR4)
-		AC_DEFINE_UNQUOTED(IRIX,$version)
-		;;
-	 *irix* )
-		checklibs=no
-		AC_DEFINE_UNQUOTED(IRIX,$version)
-		;;
-	*solaris* )
-		AC_DEFINE(SVR4)
-		AC_DEFINE_UNQUOTED(SOLARIS,$version)
-		no_resolv_lib=yes;
-		;;
-	*hpux* )
-		AC_DEFINE(_HPUX_SOURCE)
-		CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE=1"
-		CFLAGS="$CFLAGS -D_HPUX_SOURCE=1"
-		AC_DEFINE_UNQUOTED(HPUX,$version)
-		;;
-	*sunos* )
-		AC_DEFINE_UNQUOTED(SUNOS,$version)
-		;;
-	osf* )
-		AC_DEFINE_UNQUOTED(DECALPHA,$version)
-		if test "$ac_cv_prog_gcc" != yes; then
-			CPPFLAGS="$CPPFLAGS -std";
-			CFLAGS="$CFLAGS -std";
-        else
-            CPPFLAGS="$CPPFLAGS -DAES_SOURCE"
-            CFLAGS="$CFLAGS -DAES_SOURCE"
-		fi
-		;;
-	*mips-sni* )
-		;;
-esac
-AC_MSG_RESULT([using CPPFLAGS=\"${CPPFLAGS}\", CFLAGS=\"${CFLAGS}\"])
-
 dnl ----------------------------------------------------------------------------
 dnl headers:
 
@@ -549,7 +396,6 @@
 	dnl A/UX uses this...
 	AC_CHECK_LIB(posix, getpwent, [LIBS="$LIBS -lposix"])
 
-	dnl use old-style shared libs if we have 'em.
 	AC_CHECK_LIB(socket_s, socket, [LIBS="$LIBS -lsocket_s"; have_socket=1], ,-lnsl)
 	if test -z "$have_socket"; then
 		AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"], , -lnsl)
@@ -1007,8 +853,8 @@
 dnl ----------------------------------------------------------------------------
 dnl check to see if you have getpgrp(0) or getpgrp()
 dnl
-dnl POSIX `getpgrp(void)'  define HAVE_GETPGRP_0
-dnl BSD   `getpgrp(int)' - takes 0 as argument
+dnl POSIX getpgrp(void)  define HAVE_GETPGRP_0
+dnl BSD   getpgrp(int) - takes 0 as argument
 dnl                        define HAVE_GETPGRP_0 0
 
 dnl check to see if you have getpgrp(0) or getpgrp()
@@ -1055,11 +901,11 @@
 
 dnl ----------------------------------------------------------------------------
 dnl just for (really) backwards compatibility
-dnl we really try not to use union wait -- it's heinously unportable.
+dnl we really try not to use union wait -- it is heinously unportable.
 dnl nicked this check from Tcl as well. ;
 dnl
 dnl The check below checks whether <sys/wait.h> defines the type
-dnl "union wait" correctly.  It's needed because of weirdness in
+dnl "union wait" correctly.  It is needed because of weirdness in
 dnl HP-UX where "union wait" is defined in both the BSD and SYS-V
 dnl environments.  Checking the usability of WIFEXITED seems to do
 dnl the trick.
@@ -1307,41 +1153,9 @@
 
 AC_PROG_MAKE_SET
 
-dnl ----------------- force this to be Bourne Shell for now ---------------
-AC_MSG_CHECKING(for shell)
-SHELL=/bin/sh
-AC_MSG_RESULT(using $SHELL (FORCED))
-
+ALL_LINGUAS="fr"
 AM_GNU_GETTEXT
 
-AC_MSG_RESULT([LIBS $LIBS, INTLLIBS $INTLLIBS])
- if test "${USE_NLS}" = yes; then
-   AC_MSG_RESULT([Using NLS, localedir ${LOCALEDIR}, need intl/libintl.a - "${USE_INCLUDED_LIBINTL}" ])
-   if test "${USE_INCLUDED_LIBINTL}" = yes ; then
-      CPPFLAGS="$CPPFLAGS -I \${top_builddir}/intl"
-	  AC_MSG_RESULT([using \${top_builddir}/intl])
-	  if test "$nls_cv_force_use_gnu_gettext" = no ; then
-		echo "NLS enabled and requested system gettext support not available."
-		echo " You may need to use:"
-		echo "  configure '--with-cppopts=-I/usr/local/include' '--with-ldopts=-L/usr/local/lib'"
-		echo " See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
-		exit 1;
-      fi
-	  if test ! -f ${srcdir}/intl/gettext.h ; then
-		echo "gettext code is not in the ${srcdir}/intl directory."
-		echo "See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
-		exit 1;
-	  fi
-   fi
-   LIBS="$INTLLIBS $LIBS"
- else
-   AC_MSG_RESULT([No NLS])
- fi   
- if test "$XGETTEXT" = "" ; then
-	 XGETTEXT=xgettext;
- fi
- AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
-
 dnl ----------------------------------------------------------------------------
 dnl ----------------- END OF GENERAL CONFIGURATION   ---------------------------
 
@@ -1393,12 +1207,12 @@
 		found=
 		if test "$found" = "" ; then
 			LIBS=" -lcrypto -lcom_err $SAVELIBS"
-			AC_CHECKING(for krb5_des_string_to_key in $LIBS, )
+			AC_MSG_NOTICE([for krb5_des_string_to_key in $LIBS])
 			AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
 		fi;
 		if test "$found" = "" ; then
 			LIBS=" -lk5crypto -lcom_err $SAVELIBS"
-			AC_CHECKING(for krb5_des_string_to_keyin $LIBS, )
+			AC_MSG_NOTICE([for krb5_des_string_to_keyin $LIBS])
 			AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
 		fi;
 		if test "$found" = "" ; then
@@ -1413,7 +1227,7 @@
 		found= 
 		if test "$found" = "" ; then
 			LIBS=" -lkrb5 $SAVELIBS"
-			AC_CHECKING(for krb5_init_context in $LIBS, )
+			AC_CHECKING([for krb5_init_context in $LIBS])
 			AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
 		fi;
 		if test "$found" = "" ; then
@@ -1427,12 +1241,12 @@
 			found=;
 			if test "$found" = "" ; then
 				LIBS=" -lkrb4 -ldes425 $SAVELIBS"
-				AC_CHECKING(for krb_recvauth in $LIBS, )
+				AC_CHECKING([for krb_recvauth in $LIBS])
 				AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
 			fi;
 			if test "$found" = "" ; then
 				LIBS=" -lkrb4 -ldes $SAVELIBS"
-				AC_CHECKING(for krb_recvauth in $LIBS, )
+				AC_CHECKING([for krb_recvauth in $LIBS])
 				AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
 			fi;
 			if test "$found" = "" ; then
@@ -1501,12 +1315,7 @@
 dnl ----------------- START OF OUTPUT ------------------------------------------
 
 
-if test "$ac_cv_prog_gcc" = yes; then
-	CFLAGS="$CFLAGS -Wall -Werror"
-fi;
-
-AC_OUTPUT(
-[
+AC_OUTPUT([
 Makefile
 HOWTO/Makefile
 TESTSUPPORT/Makefile
@@ -1535,29 +1344,23 @@
 src/psbanner
 po/Makefile.in
 intl/Makefile
-],
-[
-for i in  \
-UTILS/LPRng.pm \
-UTILS/accounting.pl \
-UTILS/decode_args_with_perl \
-UTILS/decode_args_with_sh \
-UTILS/fixid \
-UTILS/fixupdate \
-UTILS/lpq_in_perl \
-UTILS/lpr_in_perl \
-UTILS/lprm_in_perl \
-UTILS/make_lpd_conf \
-UTILS/make_printcap_use \
-UTILS/makeinc \
-UTILS/read_conf \
-UTILS/remote_active \
-UTILS/test_read \
-UTILS/update_z.pl \
-; do chmod +x $i ; done
-]
-
-)
+UTILS/LPRng.pm
+UTILS/accounting.pl
+UTILS/decode_args_with_perl
+UTILS/decode_args_with_sh
+UTILS/fixid
+UTILS/fixupdate
+UTILS/lpq_in_perl
+UTILS/lpr_in_perl
+UTILS/lprm_in_perl
+UTILS/make_lpd_conf
+UTILS/make_printcap_use
+UTILS/makeinc
+UTILS/read_conf
+UTILS/remote_active
+UTILS/test_read
+UTILS/update_z.pl
+])
 
 dnl ----------------------------------------------------------------------------
 dnl ----------------- END OF OUTPUT --------------------------------------------
--- LPRng-3.8.1/src/Makefile.in~	Fri Nov 16 17:01:32 2001
+++ LPRng-3.8.1/src/Makefile.in	Sun Nov 18 23:24:17 2001
@@ -47,9 +47,6 @@
 SHELL_PATH=@SHELL@
 SHELL = @SHELL@
 
-# loader for c programs
-LDCC=@LDCC@
-
 # any libs that need to be used to get these programs to compile:
 LIBS= @LIBS@
 
@@ -71,8 +71,6 @@
 
 # install options
 
-STRIP=@STRIP@
-
 CFLAGS:= \
 	-I${top_builddir} \
 	-I${SRC}/include -I${SRC}/common \
@@ -98,8 +96,6 @@
 FILTER_DIR = @FILTER_DIR@
 LPD_DIR    = @LPD_DIR@
 
-STRIP      = @STRIP@
-
 #********************** End of configure modifiable settings ************
 
 
@@ -187,7 +184,7 @@
 ########################################################################
 
 .SUFFIXES: .lo
-LINK =  $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@
+LINK =  $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@
 .c.lo:
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
 
@@ -310,17 +306,17 @@
 	done;
 
 	${LIBTOOL} --mode=install $(INSTALLCMD) liblpr.la $(DESTDIR)$(libdir)/liblpr.la
-	${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
-	${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
-	${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
-	${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
-	${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
-	${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
-	${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
-	${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
-	${LIBTOOL} --mode=install ${INSTALLCMD}    -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
-	${LIBTOOL} --mode=install ${INSTALLCMD}    -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
-	${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
+	${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
 	cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
 
 uninstall:
--- LPRng-3.8.1/Makefile.in~	Mon Nov 19 00:56:23 2001
+++ LPRng-3.8.1/Makefile.in	Mon Nov 19 00:56:23 2001
@@ -46,9 +46,7 @@
 LOCKFILE=\"@LOCKFILE@\"
 PSHOWALL="@PSHOWALL@"
 FILTER_DIR=@FILTER_DIR@
-LOCALEDIR=@LOCALEDIR@
 INIT=@INIT@
-USE_NLS=@USE_NLS@
 USE_GDBM=@USE_GDBM@
 LIBTOOL=@LIBTOOL@
 
@@ -111,12 +109,6 @@
 MAKETARGET=all
 
 ###############################################################################
-$(ALLDIRS):
-	if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
-		cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
-			DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
-	fi
-
 TAGS clean::
 	-$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS)
 
@@ -125,7 +117,9 @@
 	-rm -f *.bak ? ?.* core *.old
 
 install: all
-	$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS)
+	for i in $(INSTALLDIRS); do \
+		$(MAKE) install DESTDIR=$(DESTDIR) -C $$i; \
+	done
 
 	if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \
 		MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \
Commit	Line	Data
aed7ae1a	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
	3	@@ -6,53 +6,19 @@
	4	dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
12c74ff1	5	AC_INIT(Makefile.in)
ed49b813	6
12c74ff1	7	-
aed7ae1a	8	-PACKAGE=LPRng
	9	-VERSION=3.8.1
	10	+AM_INIT_AUTOMAKE(LPRng, 3.8.0)
	11
	12
12c74ff1	13	AC_CONFIG_AUX_DIR(.)
12c74ff1	14	-AC_CANONICAL_SYSTEM
87cc09c5	15	AC_CONFIG_HEADER(config.h)
	16
	17	-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
	18	-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
	19	-AC_SUBST(PACKAGE)
	20	-AC_SUBST(VERSION)
aed7ae1a	21	ALL_LINGUAS="fr"
aed7ae1a	22
12c74ff1	23	-WITH_CC dnl
	24	-WITH_CCOPTS dnl
	25	-WITH_LINKER dnl
	26	-WITH_LDOPTS dnl
	27	-WITH_CPPOPTS dnl
	28	-if test -z "$LOCALEDIR" ; then
	29	- LOCALEDIR='${prefix}/share/locale'
	30	-fi;
	31	-WITH_LOCALEDIR dnl
	32	-export LOCALEDIR
	33	-
87cc09c5	34	-AC_PREFIX_DEFAULT(/usr/local)
	35	-AC_SUBST(INSTALL)
	36	-AC_SUBST(INSTALL_MAN)
	37	-AC_SUBST(SHELL)
	38	-AC_SUBST(CPP)
	39	-AC_SUBST(CFLAGS)
	40	-AC_SUBST(CPPFLAGS)
	41	-AC_SUBST(LDFLAGS)
	42	-AC_SUBST(LDCC)
12c74ff1	43	-
aed7ae1a	44	-
87cc09c5	45	dnl check for awk
	46	AC_PROG_AWK
	47	-AC_SUBST(AWK)
cc1b0674	48	-AC_PATH_PROG(PERL,perl)dnl
87cc09c5	49	-AC_SUBST(PERL)dnl
cc1b0674	50	-AC_PATH_PROG(CHOWN,chown)dnl
	51	-AC_SUBST(CHOWN)dnl
	52	-AC_PATH_PROG(CHGRP,chgrp)dnl
	53	-AC_SUBST(CHGRP)dnl
	54	-
cc1b0674	55	+AC_PATH_PROG(PERL,perl)
	56	+AC_PATH_PROG(CHOWN,chown)
	57	+AC_PATH_PROG(CHGRP,chgrp)
	58
87cc09c5	59	dnl ----------------------------------------------------------------------------
87cc09c5	60	dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
aed7ae1a	61	@@ -333,16 +299,6 @@
87cc09c5	62	AC_MSG_RESULT($FILTER_DIR)
	63	AC_SUBST(FILTER_DIR)
	64
	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],
	69	-[v=no; STRIP=""; ],
	70	-[v=yes; STRIP="-s"; ]
	71	-)
	72	-AC_MSG_RESULT($v)
	73	-AC_SUBST(STRIP)
12c74ff1	74	-
	75	dnl ----------------------------------------------------------------------------
	76	dnl ------------ OS Checks --------------------------------------------------
	77
aed7ae1a	78	@@ -350,50 +306,12 @@
12c74ff1	79	AC_MINIX
	80	AC_AIX
	81
	82	-
	83	-changequote(, )dnl
	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; }' `;
	90	-fi
	91	-osword=`echo $target_os \| sed -e 's/[0-9].*//'`; export osword
	92	-changequote([, ])dnl
	93	-AC_MSG_RESULT([Target is $target, arch $target_cpu, os $target_os, release $release, version $version])
	94	-
	95	-AC_DEFINE_UNQUOTED(ARCHITECTURE,"$target_cpu")
	96	-AC_DEFINE_UNQUOTED(OSNAME,"$osword")
	97	-AC_DEFINE_UNQUOTED(OSVERSION,$version)
	98	-OSNAME=$osword
	99	-OSVERSION=$version
	100	-AC_SUBST(OSNAME)dnl
	101	-AC_SUBST(OSVERSION)dnl
a0d9810a	102	-
87cc09c5	103	-
	104	dnl ----------------------------------------------------------------------------
	105	dnl ----------- C compiler checks -----------------------------------------
12c74ff1	106
87cc09c5	107	AC_PROG_CPP
12c74ff1	108	AC_PROG_CC
87cc09c5	109
	110	-if test "$ac_cv_prog_gcc" = yes; then
	111	- cat >conftest.c <<EOF
	112	-#if __GNUC__ < 2 \|\| (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
	113	-yes
	114	-#endif
	115	-EOF
	116	- if ${CC-cc} -E conftest.c \| egrep yes >/dev/null 2>&1; then
	117	- gcc -v
	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"
	120	- exit 1
	121	- fi;
	122	-fi;
	123	-
	124	-LDCC="$CC"
12c74ff1	125	-
	126	AM_PROG_LIBTOOL
	127
	128	AC_C_CONST
aed7ae1a	129	@@ -451,77 +369,6 @@
12c74ff1	130	AC_DEFINE(HAVE_QUAD_T)
	131	fi
	132
	133	-
	134	-dnl ----------------------------------------------------------------------------
	135	-dnl OS dependency checks
	136	-checklibs=
	137	-case $target_os in
	138	- linux )
	139	- no_resolv_lib=yes;
	140	- case $release in
	141	-changequote(, )dnl
	142	- 2.2.1[0-5]* )
	143	-changequote([, ])dnl
	144	- AC_DEFINE(SETUID_CHECK)
	145	- AC_MSG_WARN([Kernel may have SETUID compromise. Update kernel])
	146	- ;;
	147	- esac
	148	- ;;
	149	- bsdi )
	150	- LDCC=shlicc
	151	- dnl BSDI uses this for setproctitle
	152	- AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
	153	- ;;
	154	- bsd )
	155	- dnl *BSD uses this for setproctitle
	156	- AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
	157	- ;;
	158	- unicos )
	159	- checklibs=no
	160	- ;;
	161	- irix6 )
	162	- checklibs=no
	163	- AC_DEFINE_UNQUOTED(IRIX,$version)
	164	- ;;
	165	- irix5 )
	166	- checklibs=no
	167	- AC_DEFINE(HAVE_BROKEN_TIOCEXCL)
	168	- AC_DEFINE(SVR4)
	169	- AC_DEFINE_UNQUOTED(IRIX,$version)
	170	- ;;
	171	- irix )
	172	- checklibs=no
	173	- AC_DEFINE_UNQUOTED(IRIX,$version)
	174	- ;;
	175	- solaris )
	176	- AC_DEFINE(SVR4)
	177	- AC_DEFINE_UNQUOTED(SOLARIS,$version)
	178	- no_resolv_lib=yes;
	179	- ;;
	180	- hpux )
	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)
	185	- ;;
	186	- sunos )
	187	- AC_DEFINE_UNQUOTED(SUNOS,$version)
	188	- ;;
	189	- osf* )
	190	- AC_DEFINE_UNQUOTED(DECALPHA,$version)
	191	- if test "$ac_cv_prog_gcc" != yes; then
	192	- CPPFLAGS="$CPPFLAGS -std";
	193	- CFLAGS="$CFLAGS -std";
194	- else
195	- CPPFLAGS="$CPPFLAGS -DAES_SOURCE"
196	- CFLAGS="$CFLAGS -DAES_SOURCE"
197	- fi
198	- ;;
199	- mips-sni )
200	- ;;
201	-esac
202	-AC_MSG_RESULT([using CPPFLAGS=\"${CPPFLAGS}\", CFLAGS=\"${CFLAGS}\"])
87cc09c5	203	-
87cc09c5	204	dnl ----------------------------------------------------------------------------
12c74ff1	205	dnl headers:
87cc09c5	206
aed7ae1a	207	@@ -549,7 +396,6 @@
12c74ff1	208	dnl A/UX uses this...
	209	AC_CHECK_LIB(posix, getpwent, [LIBS="$LIBS -lposix"])
	210
	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)
aed7ae1a	215	@@ -1007,8 +853,8 @@
12c74ff1	216	dnl ----------------------------------------------------------------------------
	217	dnl check to see if you have getpgrp(0) or getpgrp()
	218	dnl
	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
	224
	225	dnl check to see if you have getpgrp(0) or getpgrp()
aed7ae1a	226	@@ -1055,11 +901,11 @@
12c74ff1	227
	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. ;
	233	dnl
	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
	239	dnl the trick.
aed7ae1a	240	@@ -1307,41 +1153,9 @@
12c74ff1	241
	242	AC_PROG_MAKE_SET
	243
	244	-dnl ----------------- force this to be Bourne Shell for now ---------------
	245	-AC_MSG_CHECKING(for shell)
	246	-SHELL=/bin/sh
	247	-AC_MSG_RESULT(using $SHELL (FORCED))
	248	-
87cc09c5	249	+ALL_LINGUAS="fr"
	250	AM_GNU_GETTEXT
	251
12c74ff1	252	-AC_MSG_RESULT([LIBS $LIBS, INTLLIBS $INTLLIBS])
a0d9810a	253	- if test "${USE_NLS}" = yes; then
12c74ff1	254	- AC_MSG_RESULT([Using NLS, localedir ${LOCALEDIR}, need intl/libintl.a - "${USE_INCLUDED_LIBINTL}" ])
a0d9810a	255	- if test "${USE_INCLUDED_LIBINTL}" = yes ; then
12c74ff1	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."
	263	- exit 1;
	264	- fi
	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."
a0d9810a	268	- exit 1;
a0d9810a	269	- fi
a0d9810a	270	- fi
12c74ff1	271	- LIBS="$INTLLIBS $LIBS"
a0d9810a	272	- else
	273	- AC_MSG_RESULT([No NLS])
	274	- fi
a0d9810a	275	- if test "$XGETTEXT" = "" ; then
	276	- XGETTEXT=xgettext;
	277	- fi
	278	- AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
a0d9810a	279	-
87cc09c5	280	dnl ----------------------------------------------------------------------------
a0d9810a	281	dnl ----------------- END OF GENERAL CONFIGURATION ---------------------------
a0d9810a	282
aed7ae1a	283	@@ -1393,12 +1207,12 @@
12c74ff1	284	found=
	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")
	290	fi;
	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")
	296	fi;
	297	if test "$found" = "" ; then
aed7ae1a	298	@@ -1413,7 +1227,7 @@
12c74ff1	299	found=
	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")
	305	fi;
	306	if test "$found" = "" ; then
aed7ae1a	307	@@ -1427,12 +1241,12 @@
12c74ff1	308	found=;
	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")
	314	fi;
	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")
	320	fi;
	321	if test "$found" = "" ; then
aed7ae1a	322	@@ -1501,12 +1315,7 @@
12c74ff1	323	dnl ----------------- START OF OUTPUT ------------------------------------------
a0d9810a	324
87cc09c5	325
12c74ff1	326	-if test "$ac_cv_prog_gcc" = yes; then
	327	- CFLAGS="$CFLAGS -Wall -Werror"
	328	-fi;
	329	-
	330	-AC_OUTPUT(
a0d9810a	331	-[
12c74ff1	332	+AC_OUTPUT([
87cc09c5	333	Makefile
87cc09c5	334	HOWTO/Makefile
87cc09c5	335	TESTSUPPORT/Makefile
aed7ae1a	336	@@ -1535,29 +1344,23 @@
87cc09c5	337	src/psbanner
a0d9810a	338	po/Makefile.in
	339	intl/Makefile
	340	-],
	341	-[
	342	-for i in \
	343	-UTILS/LPRng.pm \
	344	-UTILS/accounting.pl \
	345	-UTILS/decode_args_with_perl \
	346	-UTILS/decode_args_with_sh \
	347	-UTILS/fixid \
	348	-UTILS/fixupdate \
	349	-UTILS/lpq_in_perl \
	350	-UTILS/lpr_in_perl \
	351	-UTILS/lprm_in_perl \
	352	-UTILS/make_lpd_conf \
	353	-UTILS/make_printcap_use \
	354	-UTILS/makeinc \
	355	-UTILS/read_conf \
	356	-UTILS/remote_active \
	357	-UTILS/test_read \
	358	-UTILS/update_z.pl \
	359	-; do chmod +x $i ; done
	360	-]
87cc09c5	361	-
12c74ff1	362	-)
a0d9810a	363	+UTILS/LPRng.pm
	364	+UTILS/accounting.pl
	365	+UTILS/decode_args_with_perl
	366	+UTILS/decode_args_with_sh
	367	+UTILS/fixid
	368	+UTILS/fixupdate
	369	+UTILS/lpq_in_perl
	370	+UTILS/lpr_in_perl
	371	+UTILS/lprm_in_perl
	372	+UTILS/make_lpd_conf
	373	+UTILS/make_printcap_use
	374	+UTILS/makeinc
	375	+UTILS/read_conf
	376	+UTILS/remote_active
	377	+UTILS/test_read
	378	+UTILS/update_z.pl
12c74ff1	379	+])
87cc09c5	380
87cc09c5	381	dnl ----------------------------------------------------------------------------
12c74ff1	382	dnl ----------------- END OF OUTPUT --------------------------------------------
aed7ae1a	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
	385	@@ -47,9 +47,6 @@
12c74ff1	386	SHELL_PATH=@SHELL@
	387	SHELL = @SHELL@
	388
	389	-# loader for c programs
	390	-LDCC=@LDCC@
	391	-
	392	# any libs that need to be used to get these programs to compile:
	393	LIBS= @LIBS@
	394
aed7ae1a	395	@@ -71,8 +71,6 @@
12c74ff1	396
	397	# install options
	398
	399	-STRIP=@STRIP@
	400	-
	401	CFLAGS:= \
	402	-I${top_builddir} \
	403	-I${SRC}/include -I${SRC}/common \
aed7ae1a	404	@@ -98,8 +96,6 @@
12c74ff1	405	FILTER_DIR = @FILTER_DIR@
	406	LPD_DIR = @LPD_DIR@
	407
	408	-STRIP = @STRIP@
	409	-
	410	#******************** End of configure modifiable settings **********
	411
	412
aed7ae1a	413	@@ -187,7 +184,7 @@
12c74ff1	414	########################################################################
	415
	416	.SUFFIXES: .lo
	417	-LINK = $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@
aed7ae1a	418	+LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@
12c74ff1	419	.c.lo:
	420	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
	421
aed7ae1a	422	@@ -310,17 +306,17 @@
12c74ff1	423	done;
	424
	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;
	449
	450	uninstall:
aed7ae1a	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
	453	@@ -46,9 +46,7 @@
	454	LOCKFILE=\"@LOCKFILE@\"
	455	PSHOWALL="@PSHOWALL@"
	456	FILTER_DIR=@FILTER_DIR@
	457	-LOCALEDIR=@LOCALEDIR@
	458	INIT=@INIT@
	459	-USE_NLS=@USE_NLS@
	460	USE_GDBM=@USE_GDBM@
	461	LIBTOOL=@LIBTOOL@
	462
	463	@@ -111,12 +109,6 @@
	464	MAKETARGET=all
	465
	466	###############################################################################
	467	-$(ALLDIRS):
	468	- if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
	469	- cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
	470	- DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
	471	- fi
	472	-
	473	TAGS clean::
	474	-$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS)
	475
	476	@@ -125,7 +117,9 @@
	477	-rm -f .bak ? ?. core *.old
	478
	479	install: all
	480	- $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS)
	481	+ for i in $(INSTALLDIRS); do \
	482	+ $(MAKE) install DESTDIR=$(DESTDIR) -C $$i; \
	483	+ done
	484
	485	if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \
	486	MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \