diff --git a/m4/mni_REQUIRE_MNILIBS.m4 b/m4/mni_REQUIRE_MNILIBS.m4 index 00a73ab..925d33e 100644 --- a/m4/mni_REQUIRE_MNILIBS.m4 +++ b/m4/mni_REQUIRE_MNILIBS.m4 @@ -11,6 +11,7 @@ AC_DEFUN([mni_REQUIRE_MINC], mni_REQUIRE_LIB(hdf5,[#include ],[int f = H5Fopen("",0,H5P_DEFAULT);]) mni_REQUIRE_LIB(minc2,[#include ],[int i = miicv_create();]) AC_DEFINE([MINC2], 1, [Define if should build with MINC 2.0]) + AC_DEFINE([HAVE_MINC2], 1, [Define that we should build with MINC 2.0 agian]) else mni_REQUIRE_LIB(minc,[#include ],[int i = miicv_create();]) fi @@ -22,7 +23,7 @@ AC_DEFUN([mni_REQUIRE_VOLUMEIO], [ AC_REQUIRE([mni_REQUIRE_MINC]) if test "$with_minc2" = "yes"; then - mni_REQUIRE_LIB(volume_io2, + mni_REQUIRE_LIB(minc2, [#include ], [VIO_Volume vol; VIO_Real voxel = 0; @@ -30,9 +31,9 @@ AC_DEFUN([mni_REQUIRE_VOLUMEIO], else mni_REQUIRE_LIB(volume_io, [#include ], - [Volume vol; - Real voxel = 0; - Real x = convert_voxel_to_value(vol,voxel);]) + [VIO_Volume vol; + VIO_Real voxel = 0; + VIO_Real x = convert_voxel_to_value(vol,voxel);]) fi ]) @@ -57,6 +58,7 @@ AC_DEFUN([mni_REQUIRE_EBTKS], AC_DEFUN([mni_REQUIRE_OOBICPL], [ AC_REQUIRE([mni_REQUIRE_BICPL]) + AC_DEFINE([HAVE_MINC1], 1, [Define that we need MINC 1.0 for NC_UNSPECIFIED]) # the regular expression C library smr_REQUIRED_LIB(pcre, pcre_compile, pcre.h) diff --git a/src/create_initial_deformation_grid.cpp b/src/create_initial_deformation_grid.cpp index 2212a08..6ed4479 100644 --- a/src/create_initial_deformation_grid.cpp +++ b/src/create_initial_deformation_grid.cpp @@ -1,3 +1,6 @@ +#define HAVE_MINC1 1 +#define HAVE_MINC2 1 + #include #include #include