[MINC-development] compiling Display from github

[Jason Lerch]

Howdy devs,

I just compiled Display from github head in a virtual machine running Kubuntu 12.10. I had to make a few to me odd changes to the code to get it to compile (see the bottom of the email for the diffs). The autoconf checks appeared to think I had no GL though I clearly had, so one check had to be disabled, and I had to define a few constants. It all seems to work now but it puzzled me a bit, especially the part about the constants. Any ideas?

Jason


diff --git a/configure.in b/configure.in
index fe252d3..5445dfb 100644
--- a/configure.in
+++ b/configure.in
@@ -57,7 +57,8 @@ AX_CHECK_GLU
 AX_CHECK_GLUT
 
 dnl check if we found them
-if test "$no_gl" = yes -o "$no_glu" = yes -o "$no_glut" = yes ;
+#if test "$no_gl" = yes -o "$no_glu" = yes -o "$no_glut" = yes ;
+if "$no_glu" = yes -o "$no_glut" = yes ;
 then
    AC_MSG_ERROR([
 ================================================================================
diff --git a/m4 b/m4
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit 87caf73968c8b57db276480acf85d5da8e7e48be
+Subproject commit 87caf73968c8b57db276480acf85d5da8e7e48be-dirty
diff --git a/main/main.c b/main/main.c
index 830754e..e1e4723 100644
--- a/main/main.c
+++ b/main/main.c
@@ -23,6 +23,9 @@ static char rcsid[] = "$Header: /private-cvsroot/visualization/Display/main/main
 
 #define  MAX_TITLE_LENGTH   200
 
+#define PROJECT_NAME "Display"
+#define PROJECT_VERSION 1.5
+
 /* These two globals are required for SEAL's LibSul/SULGRAPHDATA */
 int debug = 1;
 int verbose = 1;
@@ -36,7 +39,7 @@ private  void   parse_options (int argc, char *argv[],
 
 /* The first directory is set using compiler flag -D */
 /*#define  HARD_CODED_DISPLAY_DIRECTORY1    "/usr/local/mni/lib"*/
-/*#define  HARD_CODED_DISPLAY_DIRECTORY2    "/usr/local/lib"*/
+#define  HARD_CODED_DISPLAY_DIRECTORY2    "/usr/local/minc2/lib"
 #define  GLOBALS_FILENAME                 "Display.globals"
 #define  MENU_FILENAME                    "Display.menu"