Changeset 1245

Timestamp:

21/04/09 12:32:02 (3 years ago)

Author:

Freddie Akeroyd

Message:

merge changes r1241:r1244 from trunk. Refs #115

Location:

branches/4.2

Files:

• InstallerBits (copied) (copied from trunk/InstallerBits)
• InstallerBits/Licences (copied) (copied from trunk/InstallerBits/Licences)
• InstallerBits/Licences/AUTHORS.txt (copied) (copied from trunk/InstallerBits/Licences/AUTHORS.txt)
• InstallerBits/Licences/COPYING.rtf (copied) (copied from trunk/InstallerBits/Licences/COPYING.rtf)
• InstallerBits/Licences/COPYING.txt (copied) (copied from trunk/InstallerBits/Licences/COPYING.txt)
• InstallerBits/Licences/COPYING_hdf4.txt (copied) (copied from trunk/InstallerBits/Licences/COPYING_hdf4.txt)
• InstallerBits/Licences/COPYING_hdf5.txt (copied) (copied from trunk/InstallerBits/Licences/COPYING_hdf5.txt)
• InstallerBits/Licences/COPYING_iconv.txt (copied) (copied from trunk/InstallerBits/Licences/COPYING_iconv.txt)
• InstallerBits/Licences/COPYING_libxml2.txt (copied) (copied from trunk/InstallerBits/Licences/COPYING_libxml2.txt)
• InstallerBits/Licences/COPYING_nexus.txt (copied) (copied from trunk/InstallerBits/Licences/COPYING_nexus.txt)
• InstallerBits/Licences/COPYING_zlib.txt (copied) (copied from trunk/InstallerBits/Licences/COPYING_zlib.txt)
• configure.ac (modified) (2 diffs)
• macosx_install_kit (copied) (copied from trunk/macosx_install_kit)
• macosx_install_kit/ReadMe.txt (copied) (copied from trunk/macosx_install_kit/ReadMe.txt)
• macosx_install_kit/Resources (copied) (copied from trunk/macosx_install_kit/Resources)
• macosx_install_kit/Resources/English.lproj (copied) (copied from trunk/macosx_install_kit/Resources/English.lproj)
• macosx_install_kit/Resources/English.lproj/Conclusion.txt (copied) (copied from trunk/macosx_install_kit/Resources/English.lproj/Conclusion.txt)
• macosx_install_kit/Resources/English.lproj/Description.plist (copied) (copied from trunk/macosx_install_kit/Resources/English.lproj/Description.plist)
• macosx_install_kit/Resources/English.lproj/License.txt (copied) (copied from trunk/macosx_install_kit/Resources/English.lproj/License.txt)
• macosx_install_kit/Resources/English.lproj/ReadMe.txt (copied) (copied from trunk/macosx_install_kit/Resources/English.lproj/ReadMe.txt)
• macosx_install_kit/Resources/English.lproj/Welcome.txt (copied) (copied from trunk/macosx_install_kit/Resources/English.lproj/Welcome.txt)
• macosx_install_kit/Resources/English.lproj/background.jpg (copied) (copied from trunk/macosx_install_kit/Resources/English.lproj/background.jpg)
• macosx_install_kit/Resources/postflight (copied) (copied from trunk/macosx_install_kit/Resources/postflight)
• macosx_install_kit/Resources/preflight (copied) (copied from trunk/macosx_install_kit/Resources/preflight)
• macosx_install_kit/bin (copied) (copied from trunk/macosx_install_kit/bin)
• macosx_install_kit/bin/dmgpack.sh (copied) (copied from trunk/macosx_install_kit/bin/dmgpack.sh)
• macosx_install_kit/bin/makepkg.sh (copied) (copied from trunk/macosx_install_kit/bin/makepkg.sh)
• macosx_install_kit/build_mac_kit.sh (copied) (copied from trunk/macosx_install_kit/build_mac_kit.sh)
• macosx_install_kit/pkg.config.in (copied) (copied from trunk/macosx_install_kit/pkg.config.in)

branches/4.2/configure.ac

@@ -297 +297 @@
 
 # strict aliasing causes issues with casts from NXmalloc()
-CFLAGS="-fno-strict-aliasing"
-CXXFLAGS="-fno-strict-aliasing"
+CFLAGS="$CFLAGS -fno-strict-aliasing"
+CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
 
 # check for debug
@@ -747 +747 @@
                 contrib/bindings/Makefile
                 contrib/bindings/python/Makefile
+                macosx_install_kit/pkg.config
                 scripts/Makefile
                 scripts/nexus.pc:scripts/nexus_pc.in