Changeset 1798 for trunk

Timestamp:

16/01/12 10:08:51 (4 months ago)

Author:

Freddie Akeroyd

Message:

Fix path to nxconvert. Refs #236

Location:

trunk

Files:

• applications/NXvalidate/src/org/nexusformat/nxvalidate/resources/nxvalidate.properties.in (moved) (moved from trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/resources/nxvalidate.properties) (2 diffs)
• configure.ac (modified) (3 diffs)

trunk/applications/NXvalidate/src/org/nexusformat/nxvalidate/resources/nxvalidate.properties.in

@@ -7 +7 @@
 nxsFileLabel=NXS File
 nxdlFileLabel=NXDL File
-nxconvert=/home/ser/nexus-install/bin/nxconvert
+nxconvert=@prefix@/bin/nxconvert
 openNexusFileMessage=You need to select a Nexus file to open.
 fileMenuItem=File
@@ -14 +14 @@
 validationCompleteMessage=Validation Complete
 elementError=This is an element with an error, please check.
-defaultUNIXNXconvert=/usr/local/bin/nxconvert
+defaultUNIXNXconvert=@prefix@/bin/nxconvert
 defaultWindowsNXconvert=
-defaultMacNXconvert=/usr/local/bin/nxconvert
+defaultMacNXconvert=@prefix@/bin/nxconvert
 nxconvertMissingError=Could not find nxconvert so the application will not work! Please check the settings and set the location of the nxconvert command.
 noConvertCommandFound=No nxconvert command found, cannot validate.

trunk/configure.ac

@@ -132 +132 @@
         dnl get right F77 include option
         AC_CHECK_F77_OPTION([-I$mytop/bindings/f77],[      INCLUDE 'napif.inc'])
+        FFLAGS="$FFLAGS -g"
         AC_F77_LIBRARY_LDFLAGS
         WITH_F77=yes
@@ -153 +154 @@
         dnl check that the option takes a directory and the compiler works
         mytop=`pwd`
-        FCFLAGS="$FCFLAGS -I$mytop/bindings/f90"
+        FCFLAGS="$FCFLAGS -g -I$mytop/bindings/f90"
         dnl AC_CHECK_F90_OPTION([-p $mytop/bindings/f90],[      INCLUDE 'NXmodule.f90'])
         dnl AC_CHECK_F90_OPTION([-p $mytop/bindings/f90],[      INCLUDE 'NXmodule.f90'])
@@ -834 +835 @@
                 applications/NXvalidate/Makefile
                 applications/NXvalidate/nxvalidate
+                applications/NXvalidate/src/org/nexusformat/nxvalidate/resources/nxvalidate.properties
                 applications/NXdump/Makefile
                 applications/nxingest/Makefile