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

--- LPRng-3.8.12/configure.in.orig	Mon May  6 18:00:12 2002
+++ LPRng-3.8.12/configure.in	Wed Jul 10 00:25:05 2002
@@ -6,54 +6,17 @@
 dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
 AC_INIT(Makefile.in)
 
-
-PACKAGE=LPRng
-VERSION=3.8.12
-
+AM_INIT_AUTOMAKE(LPRng, 3.8.12)
 
 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_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(PRUTIL,pr)dnl
-AC_SUBST(PRUTIL)dnl
-
+AC_PATH_PROG(PERL,perl)
+AC_PATH_PROG(CHOWN,chown)
+AC_PATH_PROG(CHGRP,chgrp)
+AC_PATH_PROG(PRUTIL,pe)
 
 dnl ----------------------------------------------------------------------------
 dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
@@ -367,16 +330,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_OPTION=""; ],
-[v=yes;  STRIP_OPTION=" -s "; ]
-)
-AC_MSG_RESULT($v)
-AC_SUBST(STRIP_OPTION)
-
 dnl ----------------------------------------------------------------------------
 dnl ------------   OS Checks  --------------------------------------------------
 
@@ -384,50 +337,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
@@ -486,77 +401,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:
 
@@ -584,7 +428,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)
@@ -1042,8 +885,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()
@@ -1090,11 +933,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.
@@ -1342,41 +1185,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   ---------------------------
 
@@ -1454,12 +1265,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
@@ -1474,7 +1285,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
@@ -1488,12 +1299,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
@@ -1562,11 +1373,6 @@
 dnl ----------------- START OF OUTPUT ------------------------------------------
 
 
-if test "$ac_cv_prog_gcc" = yes; then
-	CFLAGS="$CFLAGS -g -W -Wall -Werror -Wno-unused "
-	CPPFLAGS="$CPPFLAGS -g -W -Wall -Werror -Wno-unused "
-fi;
-
 AC_OUTPUT(
 [
 Makefile
@@ -1597,29 +1403,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.12/src/Makefile.in.orig	Mon May  6 17:26:46 2002
+++ LPRng-3.8.12/src/Makefile.in	Wed Jul 10 00:14:35 2002
@@ -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@
 
@@ -74,8 +71,6 @@
 
 # install options
 
-STRIP=@STRIP_OPTION@
-
 CFLAGS:= \
 	-I${top_builddir} \
 	-I${SRC}/include -I${SRC}/common \
@@ -93,7 +88,7 @@
 	-DCLEAR=\"@CLEAR@\"  \
 	-DUSERID=\"@USERID@\"  \
 	-DGROUPID=\"@GROUPID@\"  \
-	-DLOCALEDIR=\"@LOCALEDIR@\" \
+	-DLOCALEDIR=\"${datdadir}\locale\" \
 	-DDONE_JOBS=\"@DONE_JOBS@\" \
 	-DDONE_JOBS_MAX_AGE=\"@DONE_JOBS_MAX_AGE@\" \
 	-DUNIXSOCKETPATH=\"@UNIXSOCKETPATH@\" \
@@ -190,7 +185,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 $<
 
@@ -317,17 +312,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.12/Makefile.in.orig	Wed Apr 10 18:45:43 2002
+++ LPRng-3.8.12/Makefile.in	Tue Jul  9 23:59:48 2002
@@ -46,10 +46,7 @@
 LOCKFILE=\"@LOCKFILE@\"
 PSHOWALL="@PSHOWALL@"
 FILTER_DIR=@FILTER_DIR@
-LOCALEDIR=@LOCALEDIR@
 INIT=@INIT@
-USE_NLS=@USE_NLS@
-LIBTOOL=@LIBTOOL@
 
 #=============================================================================
 # List the directories you want to generate:
@@ -115,12 +112,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)
 
@@ -129,7 +120,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
1af4e163	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
	3	@@ -6,54 +6,17 @@
aed7ae1a	4	dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
12c74ff1	5	AC_INIT(Makefile.in)
ed49b813	6
12c74ff1	7	-
aed7ae1a	8	-PACKAGE=LPRng
1af4e163	9	-VERSION=3.8.12
	10	-
	11	+AM_INIT_AUTOMAKE(LPRng, 3.8.12)
aed7ae1a	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)
1af4e163	21	-ALL_LINGUAS="fr"
1af4e163	22	-
12c74ff1	23	-WITH_CC dnl
12c74ff1	24	-WITH_CCOPTS dnl
12c74ff1	25	-WITH_LDOPTS dnl
	26	-WITH_CPPOPTS dnl
	27	-if test -z "$LOCALEDIR" ; then
	28	- LOCALEDIR='${prefix}/share/locale'
	29	-fi;
	30	-WITH_LOCALEDIR dnl
	31	-export LOCALEDIR
	32	-
87cc09c5	33	-AC_PREFIX_DEFAULT(/usr/local)
	34	-AC_SUBST(INSTALL)
	35	-AC_SUBST(INSTALL_MAN)
	36	-AC_SUBST(SHELL)
	37	-AC_SUBST(CPP)
	38	-AC_SUBST(CFLAGS)
	39	-AC_SUBST(CPPFLAGS)
	40	-AC_SUBST(LDFLAGS)
	41	-AC_SUBST(LDCC)
12c74ff1	42	-
aed7ae1a	43	-
87cc09c5	44	dnl check for awk
	45	AC_PROG_AWK
	46	-AC_SUBST(AWK)
cc1b0674	47	-AC_PATH_PROG(PERL,perl)dnl
87cc09c5	48	-AC_SUBST(PERL)dnl
cc1b0674	49	-AC_PATH_PROG(CHOWN,chown)dnl
	50	-AC_SUBST(CHOWN)dnl
	51	-AC_PATH_PROG(CHGRP,chgrp)dnl
	52	-AC_SUBST(CHGRP)dnl
1af4e163	53	-AC_PATH_PROG(PRUTIL,pr)dnl
1af4e163	54	-AC_SUBST(PRUTIL)dnl
cc1b0674	55	-
cc1b0674	56	+AC_PATH_PROG(PERL,perl)
	57	+AC_PATH_PROG(CHOWN,chown)
	58	+AC_PATH_PROG(CHGRP,chgrp)
1af4e163	59	+AC_PATH_PROG(PRUTIL,pe)
cc1b0674	60
87cc09c5	61	dnl ----------------------------------------------------------------------------
87cc09c5	62	dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
1af4e163	63	@@ -367,16 +330,6 @@
87cc09c5	64	AC_MSG_RESULT($FILTER_DIR)
	65	AC_SUBST(FILTER_DIR)
	66
	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],
1af4e163	71	-[v=no; STRIP_OPTION=""; ],
1af4e163	72	-[v=yes; STRIP_OPTION=" -s "; ]
87cc09c5	73	-)
87cc09c5	74	-AC_MSG_RESULT($v)
1af4e163	75	-AC_SUBST(STRIP_OPTION)
12c74ff1	76	-
	77	dnl ----------------------------------------------------------------------------
	78	dnl ------------ OS Checks --------------------------------------------------
	79
1af4e163	80	@@ -384,50 +337,12 @@
12c74ff1	81	AC_MINIX
	82	AC_AIX
	83
	84	-
	85	-changequote(, )dnl
	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; }' `;
	92	-fi
	93	-osword=`echo $target_os \| sed -e 's/[0-9].*//'`; export osword
	94	-changequote([, ])dnl
	95	-AC_MSG_RESULT([Target is $target, arch $target_cpu, os $target_os, release $release, version $version])
	96	-
	97	-AC_DEFINE_UNQUOTED(ARCHITECTURE,"$target_cpu")
	98	-AC_DEFINE_UNQUOTED(OSNAME,"$osword")
	99	-AC_DEFINE_UNQUOTED(OSVERSION,$version)
	100	-OSNAME=$osword
	101	-OSVERSION=$version
	102	-AC_SUBST(OSNAME)dnl
	103	-AC_SUBST(OSVERSION)dnl
a0d9810a	104	-
87cc09c5	105	-
	106	dnl ----------------------------------------------------------------------------
	107	dnl ----------- C compiler checks -----------------------------------------
12c74ff1	108
87cc09c5	109	AC_PROG_CPP
12c74ff1	110	AC_PROG_CC
87cc09c5	111
	112	-if test "$ac_cv_prog_gcc" = yes; then
	113	- cat >conftest.c <<EOF
	114	-#if __GNUC__ < 2 \|\| (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
	115	-yes
	116	-#endif
	117	-EOF
	118	- if ${CC-cc} -E conftest.c \| egrep yes >/dev/null 2>&1; then
	119	- gcc -v
	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"
	122	- exit 1
	123	- fi;
	124	-fi;
	125	-
	126	-LDCC="$CC"
12c74ff1	127	-
	128	AM_PROG_LIBTOOL
	129
	130	AC_C_CONST
1af4e163	131	@@ -486,77 +401,6 @@
12c74ff1	132	AC_DEFINE(HAVE_QUAD_T)
	133	fi
	134
	135	-
	136	-dnl ----------------------------------------------------------------------------
	137	-dnl OS dependency checks
	138	-checklibs=
	139	-case $target_os in
	140	- linux )
	141	- no_resolv_lib=yes;
	142	- case $release in
	143	-changequote(, )dnl
	144	- 2.2.1[0-5]* )
	145	-changequote([, ])dnl
	146	- AC_DEFINE(SETUID_CHECK)
	147	- AC_MSG_WARN([Kernel may have SETUID compromise. Update kernel])
	148	- ;;
	149	- esac
	150	- ;;
	151	- bsdi )
	152	- LDCC=shlicc
	153	- dnl BSDI uses this for setproctitle
	154	- AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
	155	- ;;
	156	- bsd )
	157	- dnl *BSD uses this for setproctitle
	158	- AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
	159	- ;;
	160	- unicos )
	161	- checklibs=no
	162	- ;;
	163	- irix6 )
	164	- checklibs=no
	165	- AC_DEFINE_UNQUOTED(IRIX,$version)
	166	- ;;
	167	- irix5 )
	168	- checklibs=no
	169	- AC_DEFINE(HAVE_BROKEN_TIOCEXCL)
	170	- AC_DEFINE(SVR4)
	171	- AC_DEFINE_UNQUOTED(IRIX,$version)
	172	- ;;
	173	- irix )
	174	- checklibs=no
	175	- AC_DEFINE_UNQUOTED(IRIX,$version)
	176	- ;;
	177	- solaris )
	178	- AC_DEFINE(SVR4)
	179	- AC_DEFINE_UNQUOTED(SOLARIS,$version)
	180	- no_resolv_lib=yes;
	181	- ;;
	182	- hpux )
	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)
	187	- ;;
	188	- sunos )
	189	- AC_DEFINE_UNQUOTED(SUNOS,$version)
	190	- ;;
	191	- osf* )
	192	- AC_DEFINE_UNQUOTED(DECALPHA,$version)
	193	- if test "$ac_cv_prog_gcc" != yes; then
	194	- CPPFLAGS="$CPPFLAGS -std";
	195	- CFLAGS="$CFLAGS -std";
196	- else
197	- CPPFLAGS="$CPPFLAGS -DAES_SOURCE"
198	- CFLAGS="$CFLAGS -DAES_SOURCE"
199	- fi
200	- ;;
201	- mips-sni )
202	- ;;
203	-esac
204	-AC_MSG_RESULT([using CPPFLAGS=\"${CPPFLAGS}\", CFLAGS=\"${CFLAGS}\"])
87cc09c5	205	-
87cc09c5	206	dnl ----------------------------------------------------------------------------
12c74ff1	207	dnl headers:
87cc09c5	208
1af4e163	209	@@ -584,7 +428,6 @@
12c74ff1	210	dnl A/UX uses this...
	211	AC_CHECK_LIB(posix, getpwent, [LIBS="$LIBS -lposix"])
	212
	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)
1af4e163	217	@@ -1042,8 +885,8 @@
12c74ff1	218	dnl ----------------------------------------------------------------------------
	219	dnl check to see if you have getpgrp(0) or getpgrp()
	220	dnl
	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
	226
	227	dnl check to see if you have getpgrp(0) or getpgrp()
1af4e163	228	@@ -1090,11 +933,11 @@
12c74ff1	229
	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. ;
	235	dnl
	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
	241	dnl the trick.
1af4e163	242	@@ -1342,41 +1185,9 @@
12c74ff1	243
	244	AC_PROG_MAKE_SET
	245
	246	-dnl ----------------- force this to be Bourne Shell for now ---------------
	247	-AC_MSG_CHECKING(for shell)
	248	-SHELL=/bin/sh
	249	-AC_MSG_RESULT(using $SHELL (FORCED))
	250	-
87cc09c5	251	+ALL_LINGUAS="fr"
	252	AM_GNU_GETTEXT
	253
12c74ff1	254	-AC_MSG_RESULT([LIBS $LIBS, INTLLIBS $INTLLIBS])
a0d9810a	255	- if test "${USE_NLS}" = yes; then
12c74ff1	256	- AC_MSG_RESULT([Using NLS, localedir ${LOCALEDIR}, need intl/libintl.a - "${USE_INCLUDED_LIBINTL}" ])
a0d9810a	257	- if test "${USE_INCLUDED_LIBINTL}" = yes ; then
12c74ff1	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."
	265	- exit 1;
	266	- fi
	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."
a0d9810a	270	- exit 1;
a0d9810a	271	- fi
a0d9810a	272	- fi
12c74ff1	273	- LIBS="$INTLLIBS $LIBS"
a0d9810a	274	- else
	275	- AC_MSG_RESULT([No NLS])
	276	- fi
a0d9810a	277	- if test "$XGETTEXT" = "" ; then
	278	- XGETTEXT=xgettext;
	279	- fi
	280	- AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
a0d9810a	281	-
87cc09c5	282	dnl ----------------------------------------------------------------------------
a0d9810a	283	dnl ----------------- END OF GENERAL CONFIGURATION ---------------------------
a0d9810a	284
1af4e163	285	@@ -1454,12 +1265,12 @@
12c74ff1	286	found=
	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")
	292	fi;
	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")
	298	fi;
	299	if test "$found" = "" ; then
1af4e163	300	@@ -1474,7 +1285,7 @@
12c74ff1	301	found=
	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")
	307	fi;
	308	if test "$found" = "" ; then
1af4e163	309	@@ -1488,12 +1299,12 @@
12c74ff1	310	found=;
	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")
	316	fi;
	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")
	322	fi;
	323	if test "$found" = "" ; then
1af4e163	324	@@ -1562,11 +1373,6 @@
12c74ff1	325	dnl ----------------- START OF OUTPUT ------------------------------------------
a0d9810a	326
87cc09c5	327
12c74ff1	328	-if test "$ac_cv_prog_gcc" = yes; then
1af4e163	329	- CFLAGS="$CFLAGS -g -W -Wall -Werror -Wno-unused "
1af4e163	330	- CPPFLAGS="$CPPFLAGS -g -W -Wall -Werror -Wno-unused "
12c74ff1	331	-fi;
12c74ff1	332	-
1af4e163	333	AC_OUTPUT(
1af4e163	334	[
87cc09c5	335	Makefile
1af4e163	336	@@ -1597,29 +1403,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 --------------------------------------------
1af4e163	383	--- LPRng-3.8.12/src/Makefile.in.orig Mon May 6 17:26:46 2002
1af4e163	384	+++ LPRng-3.8.12/src/Makefile.in Wed Jul 10 00:14:35 2002
aed7ae1a	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
1af4e163	395	@@ -74,8 +71,6 @@
12c74ff1	396
	397	# install options
	398
1af4e163	399	-STRIP=@STRIP_OPTION@
12c74ff1	400	-
	401	CFLAGS:= \
	402	-I${top_builddir} \
	403	-I${SRC}/include -I${SRC}/common \
1af4e163	404	@@ -93,7 +88,7 @@
	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@\" \
	413	@@ -190,7 +185,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
1af4e163	422	@@ -317,17 +312,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:
1af4e163	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
	453	@@ -46,10 +46,7 @@
aed7ae1a	454	LOCKFILE=\"@LOCKFILE@\"
	455	PSHOWALL="@PSHOWALL@"
	456	FILTER_DIR=@FILTER_DIR@
	457	-LOCALEDIR=@LOCALEDIR@
	458	INIT=@INIT@
	459	-USE_NLS=@USE_NLS@
1af4e163	460	-LIBTOOL=@LIBTOOL@
aed7ae1a	461
1af4e163	462	#=============================================================================
	463	# List the directories you want to generate:
	464	@@ -115,12 +112,6 @@
aed7ae1a	465	MAKETARGET=all
	466
	467	###############################################################################
	468	-$(ALLDIRS):
	469	- if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
	470	- cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
	471	- DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
	472	- fi
	473	-
	474	TAGS clean::
	475	-$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS)
	476
1af4e163	477	@@ -129,7 +120,9 @@
aed7ae1a	478	-rm -f .bak ? ?. core *.old
	479
	480	install: all
	481	- $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS)
	482	+ for i in $(INSTALLDIRS); do \
	483	+ $(MAKE) install DESTDIR=$(DESTDIR) -C $$i; \
	484	+ done
	485
	486	if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \
	487	MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \