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

diff -Nru LPRng-3.7.2/configure.in LPRng-3.7.2.new/configure.in
--- LPRng-3.7.2/configure.in	Thu Dec 21 20:42:25 2000
+++ LPRng-3.7.2.new/configure.in	Thu Dec 21 20:45:20 2000
@@ -13,46 +13,13 @@
 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"
-
-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)
+AM_INIT_AUTOMAKE(LPRng, 3.7.4)
 
 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
-
-
-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
-
-
+AC_PATH_PROG(PERL,perl)
+AC_PATH_PROG(CHOWN,chown)
+AC_PATH_PROG(CHGRP,chgrp)
 
 dnl ----------------------------------------------------------------------------
 dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
@@ -331,38 +298,11 @@
 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 -----------   C compiler checks    -----------------------------------------
 AC_PROG_CC
 AC_PROG_CPP
 
-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"
-
 dnl ----------------------------------------------------------------------------
 dnl ------------   OS Checks  --------------------------------------------------
 AC_ISC_POSIX
@@ -1322,38 +1262,9 @@
 SHELL=/bin/sh
 AC_MSG_RESULT(using $SHELL (FORCED))
 
+ALL_LINGUAS="fr"
 AM_GNU_GETTEXT
 
- if test "${USE_NLS}" = yes; then
-   AC_MSG_CHECKING([Using NLS, localedir ${LOCALEDIR}, ])
-   if test "${USE_INCLUDED_LIBINTL}" = yes ; then
-	  AC_MSG_RESULT([using the local libintl installation])
-	  if test -f ${srcdir}/${nls_cv_header_libgt} ; then
-		INTLINCS='-I $(top_builddir)/intl'
-	  else
-		AC_MSG_RESULT([NLS enabled, local libintl support is needed, and])
-		AC_MSG_RESULT([ source code is not in the ${srcdir}/intl directory.])
-		AC_MSG_RESULT([ See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details.])
-		exit 1;
-	  fi
-   else
-	  AC_MSG_RESULT([using -lintl])
-	  INTLLIBS=-lintl
-   fi
- else
-   AC_MSG_RESULT([No NLS])
- fi   
- if test "${USE_NLS}" != yes -o "${USE_INCLUDED_LIBINTL}" != yes ; then
-	nls_cv_header_intl=
-	nls_cv_header_libgt=
- fi
- if test "$XGETTEXT" = "" ; then
-	 XGETTEXT=xgettext;
- fi
- AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
- AC_SUBST(INTLINCS)
- AC_SUBST(INTLLIBS)
-
 dnl ----------------------------------------------------------------------------
 dnl ----------------- END OF GENERAL CONFIGURATION   ---------------------------
 
@@ -1489,7 +1400,6 @@
 
 
 AC_OUTPUT(
-[
 Makefile
 HOWTO/Makefile
 TESTSUPPORT/Makefile
@@ -1519,28 +1429,22 @@
 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 ----------------------------------------------------------------------------
diff -Nru LPRng-3.7.2/man/Makefile.in LPRng-3.7.2.new/man/Makefile.in
--- LPRng-3.7.2/man/Makefile.in	Thu Dec 21 20:42:25 2000
+++ LPRng-3.7.2.new/man/Makefile.in	Thu Dec 21 20:41:40 2000
@@ -22,8 +22,8 @@
 
 ## fix up prefix to be a make variable
 prefix = @prefix@
-MAN =		@mandir@
-SHELL =		@SHELL@
+mandir = @mandir@
+SHELL =	@SHELL@
 
 # Install man pages in compressed form.
 # COMPRESS     = compression utility
@@ -61,13 +61,13 @@
 install:
 	for suffix in 1 2 3 4 5 6 7 8 ; do \
 	  if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
-	    if [ ! -d $(DESTDIR)$(MAN)/man$${suffix} ] ; then \
-		    echo ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
-		    ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
+	    if [ ! -d $(DESTDIR)$(mandir)/man$${suffix} ] ; then \
+		    echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
+		    ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
 	    fi; \
 	    for i in ${SRC}/*.$$suffix; do \
-		echo   $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
-		$(INSTALL)   -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
+		echo   $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
+		$(INSTALL)   -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
 	    done; \
 	  fi; \
 	done;
@@ -76,8 +76,8 @@
 	for suffix in 1 2 3 4 5 6 7 8 ; do \
 	  if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
 	    for i in ${SRC}/*.$$suffix; do \
-		echo   rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
-		rm   $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
+		echo   rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
+		rm   $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
 	    done; \
 	  fi; \
 	done;
diff -Nru LPRng-3.7.2/src/Makefile.in LPRng-3.7.2.new/src/Makefile.in
--- LPRng-3.7.2/src/Makefile.in	Thu Dec 21 20:42:25 2000
+++ LPRng-3.7.2.new/src/Makefile.in	Thu Dec 21 20:41:40 2000
@@ -33,7 +33,8 @@
 @SET_MAKE@
 
 # what C compiler to use.
-CC:=@CC@
+CC=@CC@
+datadir=@datadir@
 
 # what command to use to "ranlib" or "lorder" the library.
 RANLIB=@RANLIB@
@@ -47,15 +48,9 @@
 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=@INTLLIBS@ @LIBS@
 
-# add path to internationalization
-INTLINCS=@INTLINCS@
-
 ### PATHS ####
 # prefix
 prefix=@prefix@
@@ -72,10 +67,8 @@
 
 # install options
 
-STRIP=@STRIP@
-
 CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ \
- -I.. -I${SRC}/include -I${SRC}/common @INTLINCS@ \
+ -I.. -I${SRC}/include -I${SRC}/common \
  -DCHOWN=\"@CHOWN@\"  \
  -DCHGRP=\"@CHGRP@\"  \
  -DPRINTCAP_PATH=\"@PRINTCAP_PATH@\"  \
@@ -88,17 +81,14 @@
  -DLOCKFILE=\"@LOCKFILE@\"  \
  -DCLEAR=\"@CLEAR@\"  \
  -DUSERID=\"@USERID@\"  \
- -DGROUPID=\"@GROUPID@\"  \
- -DLOCALEDIR=\"@LOCALEDIR@\"
-
+ -DGROUPID=\"@GROUPID@\" \
+ -DLOCALEDIR=\"$(datadir)/locale\"
 
 USER_OBJS := @USER_OBJS@
 LDFLAGS   := @LDFLAGS@
 FILTER_DIR = @FILTER_DIR@
 LPD_DIR    = @LPD_DIR@
 
-STRIP      = @STRIP@
-
 #********************** End of configure modifiable settings ************
 
 
@@ -175,7 +165,7 @@
 
 
 SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE
-INCLUDE=.. ${SRC}/include ${INTLINCS}
+INCLUDE=.. ${SRC}/include
 
 VPATH=..:.:${SRC}/include:${SRC}/common
 
@@ -241,33 +231,33 @@
 	$(RANLIB) $@
 
 lpd: $(LPD_OBJS) liblpr.a
-	$(LDCC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
 lpr: $(LPR_OBJS) liblpr.a
-	$(LDCC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
 lpq: $(LPQ_OBJS) liblpr.a
-	$(LDCC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
 lpstat: $(LPSTAT_OBJS) liblpr.a
-	$(LDCC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
 lprm: $(LPRM_OBJS) liblpr.a
-	$(LDCC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
 lpc: $(LPC_OBJS) liblpr.a
-	$(LDCC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
 checkpc: $(CHECKPC_OBJS) liblpr.a
-	$(LDCC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
 lpf: $(LPF_OBJS)
-	$(LDCC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
 lpbanner: $(LPBANNER_OBJS)
-	$(LDCC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
 monitor: $(MONITOR_OBJS) liblpr.a
-	$(LDCC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
 
 authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh
 	rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@
 
 sserver: sserver.o liblpr.a
-	$(LDCC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
 sclient: sclient.o liblpr.a
-	$(LDCC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
 
 sendauth.o lpd_secure.o :	user_auth.stub
 
@@ -304,17 +294,17 @@
 	  if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \
 	done;
 
-	${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
-	${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
-	${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
-	${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
-	${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
-	${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
-	${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
-	${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
-	${INSTALLCMD}    -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
-	${INSTALLCMD}    -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
-	${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
+	${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
+	${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
+	${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
+	${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
+	${INSTALLCMD} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
+	${INSTALLCMD} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
+	${INSTALLCMD} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
+	${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
+	${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
+	${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
+	${INSTALLCMD} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
 	cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
 
 uninstall:
diff -Nru LPRng-3.7.4/Makefile.in LPRng-3.7.4.new/Makefile.in
--- LPRng-3.7.4/Makefile.in	Thu Dec 28 14:05:42 2000
+++ LPRng-3.7.4.new/Makefile.in	Fri Apr 27 21:56:02 2001
@@ -44,7 +44,6 @@
 LOCKFILE=\"@LOCKFILE@\"
 PSHOWALL="@PSHOWALL@"
 FILTER_DIR=@FILTER_DIR@
-LOCALEDIR=@LOCALEDIR@
 INIT=@INIT@
 USE_NLS=@USE_NLS@
 
@@ -108,7 +107,7 @@
 ###############################################################################
 $(ALLDIRS): FRC
 	if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
-		cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
+		cd $@; $(MAKE) \
 			DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
 	fi
Commit	Line	Data
cc1b0674	1	diff -Nru LPRng-3.7.2/configure.in LPRng-3.7.2.new/configure.in
	2	--- LPRng-3.7.2/configure.in Thu Dec 21 20:42:25 2000
	3	+++ LPRng-3.7.2.new/configure.in Thu Dec 21 20:45:20 2000
	4	@@ -13,46 +13,13 @@
87cc09c5	5	AC_CANONICAL_SYSTEM
	6	AC_CONFIG_HEADER(config.h)
	7
	8	-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
	9	-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
	10	-AC_SUBST(PACKAGE)
	11	-AC_SUBST(VERSION)
	12	-ALL_LINGUAS="fr"
cc1b0674	13	-
87cc09c5	14	-AC_PREFIX_DEFAULT(/usr/local)
	15	-AC_SUBST(INSTALL)
	16	-AC_SUBST(INSTALL_MAN)
	17	-AC_SUBST(SHELL)
	18	-AC_SUBST(CPP)
	19	-AC_SUBST(CFLAGS)
	20	-AC_SUBST(CPPFLAGS)
	21	-AC_SUBST(LDFLAGS)
	22	-AC_SUBST(LDCC)
180912a5	23	+AM_INIT_AUTOMAKE(LPRng, 3.7.4)
87cc09c5	24
	25	dnl check for awk
	26	AC_PROG_AWK
	27	-AC_SUBST(AWK)
cc1b0674	28	-AC_PATH_PROG(PERL,perl)dnl
87cc09c5	29	-AC_SUBST(PERL)dnl
cc1b0674	30	-AC_PATH_PROG(CHOWN,chown)dnl
	31	-AC_SUBST(CHOWN)dnl
	32	-AC_PATH_PROG(CHGRP,chgrp)dnl
	33	-AC_SUBST(CHGRP)dnl
	34	-
87cc09c5	35	-
	36	-WITH_CC dnl
	37	-WITH_CCOPTS dnl
	38	-WITH_LINKER dnl
	39	-WITH_LDOPTS dnl
	40	-WITH_CPPOPTS dnl
	41	-
a0d9810a	42	-if test -z "$LOCALEDIR" ; then
	43	- LOCALEDIR='$(prefix)/share/locale'
	44	-fi;
	45	-
	46	-WITH_LOCALEDIR dnl
	47	-
	48	-
cc1b0674	49	+AC_PATH_PROG(PERL,perl)
	50	+AC_PATH_PROG(CHOWN,chown)
	51	+AC_PATH_PROG(CHGRP,chgrp)
	52
87cc09c5	53	dnl ----------------------------------------------------------------------------
87cc09c5	54	dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
a0d9810a	55	@@ -331,38 +298,11 @@
87cc09c5	56	AC_MSG_RESULT($FILTER_DIR)
	57	AC_SUBST(FILTER_DIR)
	58
	59	-dnl default strip binaries
	60	-AC_MSG_CHECKING(disable stripped binaries)
	61	-AC_ARG_ENABLE( strip,
	62	-[ --disable-strip disable stripping binaries by default],
	63	-[v=no; STRIP=""; ],
	64	-[v=yes; STRIP="-s"; ]
	65	-)
	66	-AC_MSG_RESULT($v)
	67	-AC_SUBST(STRIP)
a0d9810a	68	-
87cc09c5	69	-
	70	dnl ----------------------------------------------------------------------------
	71	dnl ----------- C compiler checks -----------------------------------------
	72	AC_PROG_CC
	73	AC_PROG_CPP
	74
	75	-if test "$ac_cv_prog_gcc" = yes; then
	76	- cat >conftest.c <<EOF
	77	-#if __GNUC__ < 2 \|\| (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
	78	-yes
	79	-#endif
	80	-EOF
	81	- if ${CC-cc} -E conftest.c \| egrep yes >/dev/null 2>&1; then
	82	- gcc -v
	83	- echo "WARNING: gcc -O (version 2.4.5 and below) produces incorrect code"
	84	- echo " for lpd.c and other large routines. Update your GCC compiler"
	85	- exit 1
	86	- fi;
	87	-fi;
	88	-
	89	-LDCC="$CC"
	90	-
	91	dnl ----------------------------------------------------------------------------
	92	dnl ------------ OS Checks --------------------------------------------------
	93	AC_ISC_POSIX
cc1b0674	94	@@ -1322,38 +1262,9 @@
a0d9810a	95	SHELL=/bin/sh
87cc09c5	96	AC_MSG_RESULT(using $SHELL (FORCED))
87cc09c5	97
87cc09c5	98	+ALL_LINGUAS="fr"
	99	AM_GNU_GETTEXT
	100
a0d9810a	101	- if test "${USE_NLS}" = yes; then
	102	- AC_MSG_CHECKING([Using NLS, localedir ${LOCALEDIR}, ])
	103	- if test "${USE_INCLUDED_LIBINTL}" = yes ; then
	104	- AC_MSG_RESULT([using the local libintl installation])
	105	- if test -f ${srcdir}/${nls_cv_header_libgt} ; then
	106	- INTLINCS='-I $(top_builddir)/intl'
	107	- else
	108	- AC_MSG_RESULT([NLS enabled, local libintl support is needed, and])
	109	- AC_MSG_RESULT([ source code is not in the ${srcdir}/intl directory.])
	110	- AC_MSG_RESULT([ See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details.])
	111	- exit 1;
	112	- fi
	113	- else
	114	- AC_MSG_RESULT([using -lintl])
	115	- INTLLIBS=-lintl
	116	- fi
	117	- else
	118	- AC_MSG_RESULT([No NLS])
	119	- fi
	120	- if test "${USE_NLS}" != yes -o "${USE_INCLUDED_LIBINTL}" != yes ; then
	121	- nls_cv_header_intl=
	122	- nls_cv_header_libgt=
	123	- fi
	124	- if test "$XGETTEXT" = "" ; then
	125	- XGETTEXT=xgettext;
	126	- fi
	127	- AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
	128	- AC_SUBST(INTLINCS)
	129	- AC_SUBST(INTLLIBS)
	130	-
87cc09c5	131	dnl ----------------------------------------------------------------------------
a0d9810a	132	dnl ----------------- END OF GENERAL CONFIGURATION ---------------------------
a0d9810a	133
cc1b0674	134	@@ -1489,7 +1400,6 @@
a0d9810a	135
87cc09c5	136
87cc09c5	137	AC_OUTPUT(
a0d9810a	138	-[
87cc09c5	139	Makefile
87cc09c5	140	HOWTO/Makefile
87cc09c5	141	TESTSUPPORT/Makefile
cc1b0674	142	@@ -1519,28 +1429,22 @@
87cc09c5	143	src/psbanner
a0d9810a	144	po/Makefile.in
	145	intl/Makefile
	146	-],
	147	-[
	148	-for i in \
	149	-UTILS/LPRng.pm \
	150	-UTILS/accounting.pl \
	151	-UTILS/decode_args_with_perl \
	152	-UTILS/decode_args_with_sh \
	153	-UTILS/fixid \
	154	-UTILS/fixupdate \
	155	-UTILS/lpq_in_perl \
	156	-UTILS/lpr_in_perl \
	157	-UTILS/lprm_in_perl \
	158	-UTILS/make_lpd_conf \
	159	-UTILS/make_printcap_use \
	160	-UTILS/makeinc \
	161	-UTILS/read_conf \
	162	-UTILS/remote_active \
	163	-UTILS/test_read \
	164	-UTILS/update_z.pl \
	165	-; do chmod +x $i ; done
	166	-]
87cc09c5	167	-
a0d9810a	168	+UTILS/LPRng.pm
	169	+UTILS/accounting.pl
	170	+UTILS/decode_args_with_perl
	171	+UTILS/decode_args_with_sh
	172	+UTILS/fixid
	173	+UTILS/fixupdate
	174	+UTILS/lpq_in_perl
	175	+UTILS/lpr_in_perl
	176	+UTILS/lprm_in_perl
	177	+UTILS/make_lpd_conf
	178	+UTILS/make_printcap_use
	179	+UTILS/makeinc
	180	+UTILS/read_conf
	181	+UTILS/remote_active
	182	+UTILS/test_read
	183	+UTILS/update_z.pl
87cc09c5	184	)
	185
	186	dnl ----------------------------------------------------------------------------
cc1b0674	187	diff -Nru LPRng-3.7.2/man/Makefile.in LPRng-3.7.2.new/man/Makefile.in
	188	--- LPRng-3.7.2/man/Makefile.in Thu Dec 21 20:42:25 2000
	189	+++ LPRng-3.7.2.new/man/Makefile.in Thu Dec 21 20:41:40 2000
87cc09c5	190	@@ -22,8 +22,8 @@
	191
	192	## fix up prefix to be a make variable
	193	prefix = @prefix@
	194	-MAN = @mandir@
	195	-SHELL = @SHELL@
	196	+mandir = @mandir@
	197	+SHELL = @SHELL@
	198
	199	# Install man pages in compressed form.
	200	# COMPRESS = compression utility
a0d9810a	201	@@ -61,13 +61,13 @@
87cc09c5	202	install:
a0d9810a	203	for suffix in 1 2 3 4 5 6 7 8 ; do \
	204	if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
	205	- if [ ! -d $(DESTDIR)$(MAN)/man$${suffix} ] ; then \
	206	- echo ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
	207	- ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
	208	+ if [ ! -d $(DESTDIR)$(mandir)/man$${suffix} ] ; then \
	209	+ echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
	210	+ ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
	211	fi; \
	212	for i in ${SRC}/*.$$suffix; do \
	213	- echo $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
	214	- $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
	215	+ echo $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
	216	+ $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
	217	done; \
87cc09c5	218	fi; \
87cc09c5	219	done;
a0d9810a	220	@@ -76,8 +76,8 @@
	221	for suffix in 1 2 3 4 5 6 7 8 ; do \
	222	if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
	223	for i in ${SRC}/*.$$suffix; do \
	224	- echo rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
	225	- rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
	226	+ echo rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
	227	+ rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
	228	done; \
87cc09c5	229	fi; \
87cc09c5	230	done;
cc1b0674	231	diff -Nru LPRng-3.7.2/src/Makefile.in LPRng-3.7.2.new/src/Makefile.in
	232	--- LPRng-3.7.2/src/Makefile.in Thu Dec 21 20:42:25 2000
	233	+++ LPRng-3.7.2.new/src/Makefile.in Thu Dec 21 20:41:40 2000
a0d9810a	234	@@ -33,7 +33,8 @@
	235	@SET_MAKE@
	236
	237	# what C compiler to use.
	238	-CC:=@CC@
	239	+CC=@CC@
	240	+datadir=@datadir@
	241
	242	# what command to use to "ranlib" or "lorder" the library.
	243	RANLIB=@RANLIB@
	244	@@ -47,15 +48,9 @@
87cc09c5	245	SHELL_PATH=@SHELL@
	246	SHELL = @SHELL@
	247
	248	-# loader for c programs
	249	-LDCC=@LDCC@
	250	-
	251	# any libs that need to be used to get these programs to compile:
a0d9810a	252	LIBS=@INTLLIBS@ @LIBS@
87cc09c5	253
a0d9810a	254	-# add path to internationalization
	255	-INTLINCS=@INTLINCS@
	256	-
	257	### PATHS ####
	258	# prefix
	259	prefix=@prefix@
	260	@@ -72,10 +67,8 @@
	261
	262	# install options
87cc09c5	263
87cc09c5	264	-STRIP=@STRIP@
a0d9810a	265	-
	266	CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ \
	267	- -I.. -I${SRC}/include -I${SRC}/common @INTLINCS@ \
	268	+ -I.. -I${SRC}/include -I${SRC}/common \
	269	-DCHOWN=\"@CHOWN@\" \
	270	-DCHGRP=\"@CHGRP@\" \
	271	-DPRINTCAP_PATH=\"@PRINTCAP_PATH@\" \
	272	@@ -88,17 +81,14 @@
	273	-DLOCKFILE=\"@LOCKFILE@\" \
	274	-DCLEAR=\"@CLEAR@\" \
	275	-DUSERID=\"@USERID@\" \
	276	- -DGROUPID=\"@GROUPID@\" \
	277	- -DLOCALEDIR=\"@LOCALEDIR@\"
	278	-
	279	+ -DGROUPID=\"@GROUPID@\" \
	280	+ -DLOCALEDIR=\"$(datadir)/locale\"
	281
	282	USER_OBJS := @USER_OBJS@
	283	LDFLAGS := @LDFLAGS@
	284	FILTER_DIR = @FILTER_DIR@
	285	LPD_DIR = @LPD_DIR@
	286
	287	-STRIP = @STRIP@
87cc09c5	288	-
	289	#******************** End of configure modifiable settings **********
	290
	291
a0d9810a	292	@@ -175,7 +165,7 @@
	293
	294
	295	SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE
	296	-INCLUDE=.. ${SRC}/include ${INTLINCS}
	297	+INCLUDE=.. ${SRC}/include
	298
	299	VPATH=..:.:${SRC}/include:${SRC}/common
	300
	301	@@ -241,33 +231,33 @@
87cc09c5	302	$(RANLIB) $@
	303
	304	lpd: $(LPD_OBJS) liblpr.a
a0d9810a	305	- $(LDCC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
a0d9810a	306	+ $(CC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
87cc09c5	307	lpr: $(LPR_OBJS) liblpr.a
a0d9810a	308	- $(LDCC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
a0d9810a	309	+ $(CC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
87cc09c5	310	lpq: $(LPQ_OBJS) liblpr.a
a0d9810a	311	- $(LDCC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
a0d9810a	312	+ $(CC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
87cc09c5	313	lpstat: $(LPSTAT_OBJS) liblpr.a
a0d9810a	314	- $(LDCC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
a0d9810a	315	+ $(CC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
87cc09c5	316	lprm: $(LPRM_OBJS) liblpr.a
a0d9810a	317	- $(LDCC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
a0d9810a	318	+ $(CC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
87cc09c5	319	lpc: $(LPC_OBJS) liblpr.a
a0d9810a	320	- $(LDCC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
a0d9810a	321	+ $(CC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
87cc09c5	322	checkpc: $(CHECKPC_OBJS) liblpr.a
a0d9810a	323	- $(LDCC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
a0d9810a	324	+ $(CC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
87cc09c5	325	lpf: $(LPF_OBJS)
a0d9810a	326	- $(LDCC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
a0d9810a	327	+ $(CC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
87cc09c5	328	lpbanner: $(LPBANNER_OBJS)
a0d9810a	329	- $(LDCC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
a0d9810a	330	+ $(CC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
87cc09c5	331	monitor: $(MONITOR_OBJS) liblpr.a
a0d9810a	332	- $(LDCC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
a0d9810a	333	+ $(CC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
87cc09c5	334
87cc09c5	335	authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh
a0d9810a	336	rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@
87cc09c5	337
87cc09c5	338	sserver: sserver.o liblpr.a
a0d9810a	339	- $(LDCC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
a0d9810a	340	+ $(CC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
87cc09c5	341	sclient: sclient.o liblpr.a
a0d9810a	342	- $(LDCC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
a0d9810a	343	+ $(CC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
87cc09c5	344
	345	sendauth.o lpd_secure.o : user_auth.stub
	346
a0d9810a	347	@@ -304,17 +294,17 @@
87cc09c5	348	if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \
	349	done;
	350
a0d9810a	351	- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
	352	- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
	353	- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
	354	- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
	355	- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
	356	- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
	357	- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
	358	- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
	359	- ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
	360	- ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
	361	- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
	362	+ ${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
	363	+ ${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
	364	+ ${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
	365	+ ${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
	366	+ ${INSTALLCMD} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
	367	+ ${INSTALLCMD} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
	368	+ ${INSTALLCMD} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
	369	+ ${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
	370	+ ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
	371	+ ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
	372	+ ${INSTALLCMD} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
	373	cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
87cc09c5	374
87cc09c5	375	uninstall:
bb5055ef	376	diff -Nru LPRng-3.7.4/Makefile.in LPRng-3.7.4.new/Makefile.in
	377	--- LPRng-3.7.4/Makefile.in Thu Dec 28 14:05:42 2000
	378	+++ LPRng-3.7.4.new/Makefile.in Fri Apr 27 21:56:02 2001
	379	@@ -44,7 +44,6 @@
	380	LOCKFILE=\"@LOCKFILE@\"
	381	PSHOWALL="@PSHOWALL@"
	382	FILTER_DIR=@FILTER_DIR@
	383	-LOCALEDIR=@LOCALEDIR@
	384	INIT=@INIT@
	385	USE_NLS=@USE_NLS@
	386
	387	@@ -108,7 +107,7 @@
	388	###############################################################################
	389	$(ALLDIRS): FRC
	390	if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
	391	- cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
	392	+ cd $@; $(MAKE) \
	393	DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
	394	fi
	395