fix for configure.in

fix for configure.in

[Dave Love]

I understand there's going to be a bug-fix version of 21.3.  This
fixes the check for libjpeg under Irix with the proprietary cc, for
instance.  Sorry I didn't spot it before, and I guess Irix isn't
getting other useful testing.

(The CVS head code is OK since I re-wrote that bit for autoconf 2.5x.)

2003-04-09  Dave Love  <fx@gnu.org>

	* configure.in: Fix test of jpeglib.h to avoid leading space.

cd /net/pxfs5/home/fx/packages/emacs-21.3/
diff -c /net/pxfs5/home/fx/packages/emacs-21.3/configure.in\~ /net/pxfs5/home/fx/packages/emacs-21.3/configure.in
*** /net/pxfs5/home/fx/packages/emacs-21.3/configure.in~	Sun Mar 16 22:06:05 2003
--- /net/pxfs5/home/fx/packages/emacs-21.3/configure.in	Wed Apr  9 15:32:49 2003
***************
*** 1879,1889 ****
    if test "${HAVE_JPEG}" = "yes"; then
      AC_DEFINE(HAVE_JPEG)
      AC_EGREP_CPP(
! changequote({, })dnl avoid leadingspace on the next line
  {version= *(6[2-9]|[7-9][0-9])},
  changequote([, ])dnl
!         [#include <jpeglib.h>
! 	 version=JPEG_LIB_VERSION
  ],    
          AC_DEFINE(HAVE_JPEG),
          [AC_MSG_WARN([libjpeg found, but not version 6b or later])
--- 1879,1889 ----
    if test "${HAVE_JPEG}" = "yes"; then
      AC_DEFINE(HAVE_JPEG)
      AC_EGREP_CPP(
! changequote({, })dnl avoid leading space on the next line
  {version= *(6[2-9]|[7-9][0-9])},
  changequote([, ])dnl
! [#include <jpeglib.h>
! version=JPEG_LIB_VERSION
  ],    
          AC_DEFINE(HAVE_JPEG),
          [AC_MSG_WARN([libjpeg found, but not version 6b or later])

Diff finished at Wed Apr  9 15:33:30

Re: fix for configure.in

[Andreas Schwab]

Dave Love <d.love@dl.ac.uk> writes:

|> I understand there's going to be a bug-fix version of 21.3.  This
|> fixes the check for libjpeg under Irix with the proprietary cc, for
|> instance.

Thanks, this is already fixed in CVS.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: fix for configure.in

[Dave Love]

Andreas Schwab <schwab@suse.de> writes:

> Thanks, this is already fixed in CVS.

There should be a ChangeLog entry for it, which would have saved me
some time.

Re: fix for configure.in

[Andreas Schwab]

Dave Love <d.love@dl.ac.uk> writes:

|> Andreas Schwab <schwab@suse.de> writes:
|> 
|> > Thanks, this is already fixed in CVS.
|> 
|> There should be a ChangeLog entry for it, which would have saved me
|> some time.

There is.

2003-04-07  Andreas Schwab  <schwab@suse.de>

	* configure.in: Avoid whitespace before preprocessor directive.
	* configure: Rebuild.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: fix for configure.in

[Richard Stallman]

Here's the change log entry for the change I already installed.

2003-04-08  Richard M. Stallman  <rms@gnu.org>

	* configure.in: Put #include of jpeglib.h at start of line.

Re: fix for configure.in

[Andreas Schwab]

Richard Stallman <rms@gnu.org> writes:

|> Here's the change log entry for the change I already installed.
|> 
|> 2003-04-08  Richard M. Stallman  <rms@gnu.org>
|> 
|> 	* configure.in: Put #include of jpeglib.h at start of line.

Actually mainline was already safe, but it won't hurt either.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: fix for configure.in

[Dave Love]

Andreas Schwab <schwab@suse.de> writes:

> Actually mainline was already safe, but it won't hurt either.

As I replied to rms, it hurts from a maintenance point of view.  You
see it and it makes no sense, especially in the context of surrounding
cases which haven't been changed.  If you want to modify it for some
reason, you have to decide whether it's bogus or there's something
else you don't understand.

Re: fix for configure.in

[Andreas Schwab]

Andreas Schwab <schwab@suse.de> writes:

|> Dave Love <d.love@dl.ac.uk> writes:
|> 
|> |> I understand there's going to be a bug-fix version of 21.3.  This
|> |> fixes the check for libjpeg under Irix with the proprietary cc, for
|> |> instance.
|> 
|> Thanks, this is already fixed in CVS.

I apologize, I just noticed I forgot to check it in.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."