Merge trunk changes [1869] to [1871] refs #306

git-svn-id: https://svn.nexusformat.org/code/branches/4.3@1872 ff5d1e40-2be0-497f-93bd-dc18237bd3c7

Author: FreddieAkeroyd

Makefile.am

@@ -34,7 +34,7 @@ CONTRIB=contrib
 endif
 SUBDIRS=third_party include src bindings applications test scripts examples doc macosx_install_kit $(CONTRIB)
 
-EXTRA_DIST=build_rules.am nexus_spec.in nexus.spec autogen.sh autoversion.sh \
+EXTRA_DIST=build_rules.am nexus_spec.in nexus.spec autoversion.sh \
 		build_rpm.in README.cygwin README.macosx \
 		README.MinGW make_mingw_links \
 		configure_mingw_kit Windows_extra InstallerBits \

include/napi.h

@@ -51,7 +51,9 @@
 #ifndef NEXUSAPI
 #define NEXUSAPI
 
+#if HAVE_CONFIG_H
 #include <napiconfig.h>
+#endif /* HAVE_CONFIG_H */
 
 /* NeXus HDF45 */
 #define NEXUS_VERSION   "4.3.0"                /* major.minor.patch */