diff -urN dx-4.4.4/bin/Makefile.am dx-new/bin/Makefile.am --- dx-4.4.4/bin/Makefile.am 2003-07-11 20:11:37.000000000 -0400 +++ dx-new/bin/Makefile.am 2011-12-04 22:58:28.000000000 -0500 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in dxbindir = $(prefix)/dx/bin -bindir = $(prefix)/bin +bindir = $(exec_prefix)/bin EXTRA_SCRIPTS = mdf2c dx EXTRA_DIST = url_handler.sh diff -urN dx-4.4.4/bin/dx.in dx-new/bin/dx.in --- dx-4.4.4/bin/dx.in 2004-05-31 12:12:05.000000000 -0400 +++ dx-new/bin/dx.in 2011-12-04 22:58:28.000000000 -0500 @@ -60,10 +60,10 @@ # longhelp() { -if test -f "$dxroot/man/catl/dx.l" ; then - more "$dxroot/man/catl/dx.l" +if test -f "$dxroot/../man/catl/dx.l" ; then + more "$dxroot/../man/catl/dx.l" else - echo "cannot find $dxroot/man/catl/dx.l" + echo "cannot find $dxroot/../man/catl/dx.l" echo "set the DXROOT environment variable to the root of the" echo "dx installation tree and try again." fi diff -urN dx-4.4.4/configure.ac dx-new/configure.ac --- dx-4.4.4/configure.ac 2006-08-21 17:56:08.000000000 -0400 +++ dx-new/configure.ac 2011-12-04 22:58:28.000000000 -0500 @@ -218,6 +218,7 @@ dnl End of command line options configuration dnl Start DX configuration +AC_PROG_CXX AC_LANG([C++]) AC_CHECK_HEADERS(stdlib.h) AC_LANG([C]) @@ -505,6 +506,11 @@ LIBS="-L$xm_libraries $LIBS" fi +if test "$ARCH" = "macos" ; then + LDFLAGS="$LDFLAGS -dylib_file \ + /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\ +/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" +fi AC_CHECK_LIB(GL, glXGetConfig) AC_CHECK_LIB(GLU, gluBuild2DMipmaps) @@ -677,7 +683,7 @@ fi dnl -- check for unix else - AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg ]) + AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg -lsz ]) AC_MSG_CHECKING(if HDF package is complete) if test $passed -gt 0 then @@ -686,7 +692,7 @@ AC_MSG_RESULT(no -- some components failed test) have_hdf='no (failed tests)' else - LIB_HDF='-ldf' + LIB_HDF='-ldf -ljpeg -lsz ' LIBS="$LIB_HDF $LIBS" FMT_LIBS="$FMT_LIBS libdf.a" AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries]) @@ -801,7 +807,12 @@ failed=0; passed=0; + if test "$HAVE_MC" = "yes" ; then + mysave_CPPFLAGS=$CPPFLAGS + CPPFLAGS="`Magick-config --cppflags` $CPPFLAGS" + fi AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) + CPPFLAGS=$mysave_CPPFLAGS if test "$ARCH" = "intelnt" ; then AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) AC_MSG_CHECKING(if ImageMagick package is complete) @@ -836,7 +847,7 @@ if test "$HAVE_MC" = "yes" ; then LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`" - AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) + AC_CHECK_LIB( MagickCore,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) AC_MSG_CHECKING(if ImageMagick package is complete) if test $passed -gt 0 then diff -urN dx-4.4.4/include/Makefile.am dx-new/include/Makefile.am --- dx-4.4.4/include/Makefile.am 2006-04-08 23:44:49.000000000 -0400 +++ dx-new/include/Makefile.am 2011-12-04 22:58:28.000000000 -0500 @@ -1,4 +1,4 @@ -dxincdir = $(prefix)/dx/include +dxincdir = $(exec_prefix)/include SUBDIRS = dx dxinc_HEADERS = dxl.h dxstereo.h nodist_dxinc_HEADERS = dxconfig.h diff -urN dx-4.4.4/include/dx/Makefile.am dx-new/include/dx/Makefile.am --- dx-4.4.4/include/dx/Makefile.am 1999-05-25 19:35:16.000000000 -0400 +++ dx-new/include/dx/Makefile.am 2011-12-04 22:58:28.000000000 -0500 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -dxincdir = $(prefix)/dx/include/dx +dxincdir = $(exec_prefix)/include/dx dxinc_HEADERS = \ UserInteractors.h advanced.h arch.h array.h arrayhandles.h \ diff -urN dx-4.4.4/man/catl/Makefile.am dx-new/man/catl/Makefile.am --- dx-4.4.4/man/catl/Makefile.am 1999-04-05 07:56:00.000000000 -0400 +++ dx-new/man/catl/Makefile.am 2011-12-04 22:58:28.000000000 -0500 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -catdir = $(prefix)/dx/man/catl +catdir = $(exec_prefix)/share/man/catl cat_DATA = dx.l EXTRA_DIST = $(cat_DATA) diff -urN dx-4.4.4/man/manl/Makefile.am dx-new/man/manl/Makefile.am --- dx-4.4.4/man/manl/Makefile.am 2002-05-20 00:47:06.000000000 -0400 +++ dx-new/man/manl/Makefile.am 2011-12-04 22:58:28.000000000 -0500 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -mandir = $(prefix)/dx/man +mandir = $(exec_prefix)/share/man man_MANS = dx.l EXTRA_DIST = $(man_MANS) diff -urN dx-4.4.4/src/exec/dpexec/packet.c dx-new/src/exec/dpexec/packet.c --- dx-4.4.4/src/exec/dpexec/packet.c 2006-04-27 11:34:53.000000000 -0400 +++ dx-new/src/exec/dpexec/packet.c 2011-12-05 00:26:25.000000000 -0500 @@ -143,6 +143,8 @@ { if (sts > 0 && (!tmpbufferused || *tmpbufferused == 0)) { + //see http://www.opendx.org/bugs/view.php?id=251 + sts=0; // MHM change in case IOCTL fails if(SFILEIoctl(_dxd_exSockFD, FIONBIO, &one) >= 0) sts = writeToSFILE(_dxd_exSockFD, packet, length); SFILEIoctl(_dxd_exSockFD, FIONBIO, &zero); diff -urN dx-4.4.4/src/exec/dxmods/_im_image.c dx-new/src/exec/dxmods/_im_image.c --- dx-4.4.4/src/exec/dxmods/_im_image.c 2006-01-05 17:55:43.000000000 -0500 +++ dx-new/src/exec/dxmods/_im_image.c 2011-12-04 22:58:28.000000000 -0500 @@ -999,8 +999,11 @@ /* Opacities in colormap is wrong; use direct color map */ if ( image->matte ) for ( x = 0; x < width; x++ ) - omap[*(indexes2++)] = ( 1.0 - + { + int omap_index = *(indexes2++); // if Magick has HDRI, Quantum is a float + omap[(omap_index < 0 ? 0 : omap_index)] = ( 1.0 - // clamp if negative ((float) (pixies++)->opacity) / MaxRGB ); + } } } else DXErrorGoto( ERROR_INTERNAL, "unexpected image field format" ); diff -urN dx-4.4.4/src/uipp/base/StartWebBrowser.C dx-new/src/uipp/base/StartWebBrowser.C --- dx-4.4.4/src/uipp/base/StartWebBrowser.C 2005-12-16 16:11:51.000000000 -0500 +++ dx-new/src/uipp/base/StartWebBrowser.C 2011-12-04 22:58:28.000000000 -0500 @@ -13,6 +13,11 @@ #include #if defined(macos) +#define _UINT64 +#define _UINT32 +#define _UINT16 +#define _UINT8 + #include #endif