LPRng-ac_fixes.patch

   1 diff -Nru LPRng-3.6.26/configure.in LPRng-3.6.26.new/configure.in
   2 --- LPRng-3.6.26/configure.in   Mon Oct 16 21:11:58 2000
   3 +++ LPRng-3.6.26.new/configure.in       Mon Oct 16 21:11:30 2000
   4 @@ -2,44 +2,17 @@
   5  dnl
   6  dnl $Id$
   7
   8 -PACKAGE=LPRng
   9 -VERSION=3.6.26
  10 -
  11  dnl ----------------------------------------------------------------------------
  12  dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
  13  AC_INIT(Makefile.in)
  14 -AC_CONFIG_AUX_DIR(.)
  15  AC_CANONICAL_SYSTEM
  16  AC_CONFIG_HEADER(config.h)
  17
  18 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
  19 -AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
  20 -AC_SUBST(PACKAGE)
  21 -AC_SUBST(VERSION)
  22 -ALL_LINGUAS="fr"
  23 -
  24 -AC_PREFIX_DEFAULT(/usr/local)
  25 -AC_SUBST(INSTALL)
  26 -AC_SUBST(INSTALL_MAN)
  27 -AC_SUBST(SHELL)
  28 -AC_SUBST(CPP)
  29 -AC_SUBST(CFLAGS)
  30 -AC_SUBST(CPPFLAGS)
  31 -AC_SUBST(LDFLAGS)
  32 -AC_SUBST(LDCC)
  33 +AM_INIT_AUTOMAKE(LPRng, 3.6.26)
  34
  35  dnl check for awk
  36  AC_PROG_AWK
  37 -AC_SUBST(AWK)
  38  AC_PATH_PROG(PERL,perl)dnl
  39 -AC_SUBST(PERL)dnl
  40 -
  41 -WITH_CC dnl
  42 -WITH_CCOPTS dnl
  43 -WITH_LINKER dnl
  44 -WITH_LDOPTS dnl
  45 -WITH_CPPOPTS dnl
  46 -
  47
  48  dnl ----------------------------------------------------------------------------
  49  dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
  50 @@ -299,37 +272,11 @@
  51  AC_MSG_RESULT($FILTER_DIR)
  52  AC_SUBST(FILTER_DIR)
  53
  54 -dnl default strip binaries
  55 -AC_MSG_CHECKING(disable stripped binaries)
  56 -AC_ARG_ENABLE( strip,
  57 -[  --disable-strip                   disable stripping binaries by default],
  58 -[v=no; STRIP=""; ],
  59 -[v=yes;  STRIP="-s"; ]
  60 -)
  61 -AC_MSG_RESULT($v)
  62 -AC_SUBST(STRIP)
  63 -
  64  dnl ----------------------------------------------------------------------------
  65  dnl -----------   C compiler checks    -----------------------------------------
  66  AC_PROG_CC
  67  AC_PROG_CPP
  68
  69 -if test "$ac_cv_prog_gcc" = yes; then
  70 -       cat >conftest.c <<EOF
  71 -#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
  72 -yes
  73 -#endif
  74 -EOF
  75 -    if ${CC-cc} -E conftest.c | egrep yes >/dev/null 2>&1; then
  76 -        gcc -v
  77 -               echo "WARNING: gcc -O (version 2.4.5 and below) produces incorrect code"
  78 -               echo "  for lpd.c and other large routines. Update your GCC compiler"
  79 -               exit 1
  80 -       fi;
  81 -fi;
  82 -
  83 -LDCC="$CC"
  84 -
  85  dnl ----------------------------------------------------------------------------
  86  dnl ------------   OS Checks  --------------------------------------------------
  87  AC_ISC_POSIX
  88 @@ -1280,6 +1227,7 @@
  89  AC_MSG_RESULT(using $SHELL (FORCED))
  90
  91  dnl ----------------- Option for enabling GNU gettext --------------------
  92 +ALL_LINGUAS="fr"
  93  AM_GNU_GETTEXT
  94
  95  dnl ----------------------------------------------------------------------------
  96 @@ -1396,9 +1344,7 @@
  97  dnl ----------------- START OF OUTPUT ------------------------------------------
  98
  99  AC_OUTPUT(
 100 -
 101  Makefile
 102 -Makefile.bsd
 103  HOWTO/Makefile
 104  TESTSUPPORT/Makefile
 105  DISTRIBUTIONS/Makefile
 106 @@ -1421,23 +1367,13 @@
 107  UTILS/test_read
 108  UTILS/test_read
 109  intl/Makefile
 110 -intl/intlh.inst
 111 -intl/po2tbl.sed
 112  lpd.perms
 113  printcap
 114  man/Makefile
 115  po/Makefile.in
 116 -po/POTFILES
 117  src/Makefile
 118  src/pclbanner
 119  src/psbanner
 120 -
 121 - ,[
 122 - for i in po/Makefile ; do
 123 -   if test -f $i; then chmod +w $i; fi;
 124 -   cp po/Makefile.in $i;
 125 - done;
 126 - ]
 127  )
 128
 129  dnl ----------------------------------------------------------------------------
 130 diff -Nru LPRng-3.6.26/man/Makefile.in LPRng-3.6.26.new/man/Makefile.in
 131 --- LPRng-3.6.26/man/Makefile.in        Fri Oct 13 17:08:41 2000
 132 +++ LPRng-3.6.26.new/man/Makefile.in    Mon Oct 16 21:13:21 2000
 133 @@ -22,8 +22,8 @@
 134
 135  ## fix up prefix to be a make variable
 136  prefix = @prefix@
 137 -MAN =          @mandir@
 138 -SHELL =                @SHELL@
 139 +mandir = @mandir@
 140 +SHELL =        @SHELL@
 141
 142  # Install man pages in compressed form.
 143  # COMPRESS     = compression utility
 144 @@ -61,25 +61,25 @@
 145  install:
 146         for suffix in 1 5 8 ; do \
 147           if [ ! -d $(INSTALL_PREFIX)$(MAN)/man$${suffix} ] ; then \
 148 -                 echo ${SRC}/mkinstalldirs $(INSTALL_PREFIX)$(MAN)/man$${suffix}; \
 149 -                 ${SRC}/mkinstalldirs $(INSTALL_PREFIX)$(MAN)/man$${suffix}; \
 150 +                 echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
 151 +                 ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
 152           fi; \
 153           for i in ${SRC}/*.$$suffix; do \
 154 -               echo $(INSTALL) -m 644 $$i $(INSTALL_PREFIX)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
 155 -               $(INSTALL) -m 644 $$i $(INSTALL_PREFIX)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
 156 +               echo $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
 157 +               $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
 158           done; \
 159         done;
 160  install.zman:
 161         for suffix in 1 5 8 ; do \
 162 -         if [ ! -d $(INSTALL_PREFIX)$(MAN)/man$${suffix} ] ; then \
 163 -                 echo ${SRC}/mkinstalldirs $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR); \
 164 -                 ${SRC}/mkinstalldirs $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR); \
 165 +         if [ ! -d $(DESTDIR)$(mandir)/man$${suffix} ] ; then \
 166 +                 echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR); \
 167 +                 ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR); \
 168           fi; \
 169           for i in ${SRC}/*.$$suffix; do \
 170                  echo $(COMPRESS) $$i ; \
 171                  $(COMPRESS) < $$i >_; \
 172 -                echo $(INSTALL) -m 644 _ $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
 173 -                $(INSTALL) -m 644 _ $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
 174 +                echo $(INSTALL) -m 644 _ $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
 175 +                $(INSTALL) -m 644 _ $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
 176                  rm _; \
 177           done; \
 178         done;
 179 @@ -87,15 +87,15 @@
 180  uninstall:
 181         for suffix in 1 5 8 ; do \
 182           for i in ${SRC}/*.$$suffix; do \
 183 -               echo rm $(INSTALL_PREFIX)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
 184 -               rm $(INSTALL_PREFIX)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
 185 +               echo rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
 186 +               rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
 187           done; \
 188         done;
 189  uninstall.zman:
 190         for suffix in 1 5 8 ; do \
 191           for i in ${SRC}/*.$$suffix; do \
 192 -                echo rm -f $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
 193 -                rm -f $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
 194 +                echo rm -f $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
 195 +                rm -f $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
 196           done; \
 197         done;
 198
 199 diff -Nru LPRng-3.6.26/src/Makefile.in LPRng-3.6.26.new/src/Makefile.in
 200 --- LPRng-3.6.26/src/Makefile.in        Mon Oct 16 21:11:58 2000
 201 +++ LPRng-3.6.26.new/src/Makefile.in    Mon Oct 16 21:11:30 2000
 202 @@ -47,9 +47,6 @@
 203  SHELL_PATH=@SHELL@
 204  SHELL = @SHELL@
 205
 206 -# loader for c programs
 207 -LDCC=@LDCC@
 208 -
 209  # any libs that need to be used to get these programs to compile:
 210  LIBS=@LIBS@
 211
 212 @@ -98,8 +95,6 @@
 213  CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\" $(CFLAGS)
 214  LDFLAGS:= @LDFLAGS@
 215
 216 -STRIP=@STRIP@
 217 -
 218  #********************** End of configure modifiable settings ************
 219
 220
 221 @@ -320,38 +315,38 @@
 222         $(RANLIB) $@
 223
 224  lpd: $(LPD_OBJS) liblpr.a
 225 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 226 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 227  lpr: $(LPR_OBJS) liblpr.a
 228 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 229 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 230  lpq: $(LPQ_OBJS) liblpr.a
 231 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 232 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 233  lpstat: $(LPSTAT_OBJS) liblpr.a
 234 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 235 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 236  lprm: $(LPRM_OBJS) liblpr.a
 237 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 238 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 239  lpc: $(LPC_OBJS) liblpr.a
 240 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 241 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 242  checkpc: $(CHECKPC_OBJS) liblpr.a
 243 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 244 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 245  lpf: $(LPF_OBJS)
 246 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 247 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 248  lpraccnt: $(LPRACCNT_OBJS) liblpr.a
 249 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 250 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 251  lpbanner: $(LPBANNER_OBJS)
 252 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 253 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 254  monitor: $(MONITOR_OBJS) liblpr.a
 255 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 256 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 257
 258  authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh
 259         rm -f $@; cp $^ $@; chmod 555 $@
 260
 261  #ptest: common/plp_snprintf.c
 262 -#      $(LDCC) $(CFLAGS) -DTEST -o ptest common/plp_snprintf.c
 263 +#      $(CC) $(CFLAGS) -DTEST -o ptest common/plp_snprintf.c
 264
 265  sserver: sserver.o liblpr.a
 266 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 267 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 268  sclient: sclient.o liblpr.a
 269 -       $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
 270 +       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 271
 272  sendauth.o lpd_secure.o :      user_auth.stub
 273
 274 @@ -395,31 +390,31 @@
 275
 276  install: all
 277         echo "SETUID_ROOT IS ${PERMS}, PERMS $(ROOT_PERMS)";
 278 -       for i in ${INSTALL_PREFIX}${bindir} ${INSTALL_PREFIX}${sbindir} \
 279 -               ${INSTALL_PREFIX}${sysconfdir} \
 280 -               ${INSTALL_PREFIX}${LPD_DIR} ${INSTALL_PREFIX}${FILTER_DIR}; do \
 281 +       for i in $(DESTDIR)$(bindir) $(DESTDIR)${sbindir} \
 282 +               $(DESTDIR)${sysconfdir} \
 283 +               $(DESTDIR)${LPD_DIR} $(DESTDIR)${FILTER_DIR}; do \
 284           if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \
 285         done;
 286
 287 -       ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpq ${INSTALL_PREFIX}${bindir}
 288 -       ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lprm ${INSTALL_PREFIX}${bindir}
 289 -       ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpr ${INSTALL_PREFIX}${bindir}
 290 -       ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpstat ${INSTALL_PREFIX}${bindir}
 291 -       ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpc ${INSTALL_PREFIX}${sbindir}
 292 -       ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${INSTALL_PREFIX}${LPD_DIR}
 293 -       ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${INSTALL_PREFIX}${FILTER_DIR}
 294 -       ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${INSTALL_PREFIX}${FILTER_DIR}
 295 -       ${INSTALLCMD}    -m $(NORM_PERMS) pclbanner ${INSTALL_PREFIX}${FILTER_DIR}
 296 -       ${INSTALLCMD}    -m $(NORM_PERMS) psbanner ${INSTALL_PREFIX}${FILTER_DIR}
 297 -       ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${INSTALL_PREFIX}${sbindir}
 298 -       ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpraccnt ${INSTALL_PREFIX}${sbindir}
 299 -       cd ${INSTALL_PREFIX}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
 300 +       ${INSTALLCMD} -m $(ROOT_PERMS) lpq $(DESTDIR)$(bindir)
 301 +       ${INSTALLCMD} -m $(ROOT_PERMS) lprm $(DESTDIR)$(bindir)
 302 +       ${INSTALLCMD} -m $(ROOT_PERMS) lpr $(DESTDIR)$(bindir)
 303 +       ${INSTALLCMD} -m $(ROOT_PERMS) lpstat $(DESTDIR)$(bindir)
 304 +       ${INSTALLCMD} -m $(ROOT_PERMS) lpc $(DESTDIR)${sbindir}
 305 +       ${INSTALLCMD} -m $(NORM_PERMS) lpd $(DESTDIR)${LPD_DIR}
 306 +       ${INSTALLCMD} -m $(NORM_PERMS) lpf $(DESTDIR)${FILTER_DIR}
 307 +       ${INSTALLCMD} -m $(NORM_PERMS) lpbanner $(DESTDIR)${FILTER_DIR}
 308 +       ${INSTALLCMD} -m $(NORM_PERMS) pclbanner $(DESTDIR)${FILTER_DIR}
 309 +       ${INSTALLCMD} -m $(NORM_PERMS) psbanner $(DESTDIR)${FILTER_DIR}
 310 +       ${INSTALLCMD} -m $(NORM_PERMS) checkpc $(DESTDIR)${sbindir}
 311 +       ${INSTALLCMD} -m $(NORM_PERMS) lpraccnt $(DESTDIR)${sbindir}
 312 +       cd $(DESTDIR)$(bindir); rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
 313
 314  uninstall:
 315 -       rm -f ${INSTALL_PREFIX}${LPD_DIR}/lpd
 316 -       cd ${INSTALL_PREFIX}${FILTER_DIR}; rm -f lpf lpbanner pclbanner psbanner
 317 -       cd ${INSTALL_PREFIX}${bindir}; rm -f lp lpq lpstat lpr lp cancel;
 318 -       cd ${INSTALL_PREFIX}${sbindir}; rm -f lpc checkpc lpraccnt;
 319 +       rm -f $(DESTDIR)${LPD_DIR}/lpd
 320 +       cd $(DESTDIR)${FILTER_DIR}; rm -f lpf lpbanner pclbanner psbanner
 321 +       cd $(DESTDIR)$(bindir); rm -f lp lpq lpstat lpr lp cancel;
 322 +       cd $(DESTDIR)${sbindir}; rm -f lpc checkpc lpraccnt;
 323
 324
 325  ###########################################################################