This patch accomplishes the following:

-- Auto-generates HAVE_LOCALE_H macro and adds it to jconfig.h (this is used by rdjpgcom.c.)
-- Reconciles the description and ordering of macros between config.h.in and jconfig.h.in, so the two files can be easily diffed.
-- Eliminates the use of the autoheader-generated config.h in the project and moves relevant internal-only macros into a new file, jconfigint.h.  This is to avoid "already defined" warnings in files that were including both config.h (to get the internal autotools package information or the INLINE definition) and jconfig.h.

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1257 632fc199-4ca6-4c93-a231-07263d6284db

diff --cc CMakeLists.txt
Simple merge

diff --cc configure.ac
index 9bfbf428a982f21f18cfa9d7e0e2351106cd220f,9fd2948ef521d18db4761423d307d2212f6b6d5c..8c3093cce701756bb327b3b7131049e5e5adc786
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -518,15 -485,15 +519,16 @@@ AC_SUBST(RPMARCH
  AC_SUBST(RPM_CONFIG_ARGS)
  AC_SUBST(DEBARCH)
  AC_SUBST(BUILD)
- AC_DEFINE_UNQUOTED([BUILD], "$BUILD", [Build number])
+ AC_DEFINE_UNQUOTED([BUILD], "$BUILD", [libjpeg-turbo build number])
  
 -# jconfig.h is the file we use, but we have another before that to
 -# fool autoheader. the reason is that we include this header in our
 -# API headers, which can screw things up for users of the lib.
 -# jconfig.h is a minimal version that allows this package to be built
 +# NOTE: autoheader automatically modifies the input file of the first
 +# invocation of AC_CONFIG_HEADERS, so we put config.h first to prevent
 +# jconfig.h.in from being clobbered.  config.h is used only internally, whereas
 +# jconfig.h contains macros that are relevant to external programs (macros that
 +# specify which features were built into the library.)
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_HEADERS([jconfig.h])
+ AC_CONFIG_HEADERS([jconfigint.h])
  AC_CONFIG_FILES([pkgscripts/libjpeg-turbo.spec.tmpl:release/libjpeg-turbo.spec.in])
  AC_CONFIG_FILES([pkgscripts/makecygwinpkg.tmpl:release/makecygwinpkg.in])
  AC_CONFIG_FILES([pkgscripts/makedpkg.tmpl:release/makedpkg.in])