Changeset 804

Timestamp:

03/08/06 11:35:37 (7 years ago)

Author:

faa59

Message:

Latest MinGW updates

Location:

trunk

Files:

• README.MinGW (modified) (3 diffs)
• configure.ac (modified) (2 diffs)
• file.MinGW (added)
• make_mingw_links (modified) (2 diffs)

trunk/README.MinGW

@@ -8 +8 @@
 
 If you wish a Microsoft compatible import library (.LIB file that references a DLL) to also be built, you need to make sure the LIB command is available in your MinGW path. Type LIB at the MSYS prompt now to check if this is so.
+
+Edit applications/NXtranslate/text_xml/Makefile.am and 
+applications/NXtranslate/Makefile.am and in both replace
+`xml2-config --cflags`  with  -I/usr/local/include in  AM_CPPFLAGS
 
 Now just type
@@ -31 +35 @@
 Enjoy!
 
+
+
+Use libtool 1.5 but note it has problems as MinGW does not ship the unix "file" command so you get "file magic" errors
+
+to remedy, install  file.MinGW   as /usr/local/bin/file and chmod +x it
+
+also rename libmxml.a as libmxml.dll.a
+
 Freddie Akeroyd (F.A.Akeroyd@rl.ac.uk)
 
@@ -36 +48 @@
 
 $Id$
+===================================================================
+RCS file: /isis/cvs/repository/nexus/applications/NXtranslate/text_xml/Makefile.am,v
+retrieving revision 1.3
+diff -r1.3 Makefile.am
+32c32

trunk/configure.ac

@@ -132 +132 @@
         AC_MSG_NOTICE([Java SDK home is $javaroot])
         JAVAINCLUDE="-I$javaroot/include"
-        AC_PATH_PROGS(JAVAC,javac,,[$javaroot/bin:$PATH])
+        AC_PATH_PROGS(JAVAC,gcj javac,,[$javaroot/bin:$PATH])
+        if test `basename "$JAVAC"` = "gcj"; then
+            JAVACFLAGS="-C"     # force creation of .class files
+        fi
         AC_PATH_PROGS(JAVADOC,javadoc,,[$javaroot/bin:$PATH])
         AC_PATH_PROGS(JAR,jar,,[$javaroot/bin:$PATH])
-        AC_PATH_PROGS(JAVA,java,,[$javaroot/bin:$PATH])
-        AC_PATH_PROGS(JAVAH,javah,,[$javaroot/bin:$PATH])
-fi
+        AC_PATH_PROGS(JAVA,gij java,,[$javaroot/bin:$PATH])
+        AC_PATH_PROGS(JAVAH,gcjh javah,,[$javaroot/bin:$PATH])
+fi
+
 
 #AC_ARG_WITH([java], AC_HELP_STRING([--with-java=java compiler], [Specify name of Java compiler]),
@@ -165 +169 @@
 #       JAVAINCLUDE=
 #fi
+AC_SUBST(JAVACFLAGS)
 AC_SUBST(SHARED_LDFLAGS)
 AC_SUBST(JAVAINCLUDE)

trunk/make_mingw_links

@@ -34 +34 @@
 # HDF5 windows binary install  (from http://hdf.ncsa.uiuc.edu)
 #
-ln -sf "/c/program files/hdf/5-164-win/include" /usr/local/hdf5/include
-ln -sf "/c/program files/hdf/5-164-win/dll/hdf5dll.dll" /usr/local/hdf5/lib/libhdf5.dll
+ln -sf "/c/program files/hdf/5-165-win/include" /usr/local/hdf5/include
+ln -sf "/c/program files/hdf/5-165-win/dll/hdf5dll.dll" /usr/local/hdf5/lib/libhdf5.dll
 #
 # ZLIB (from http://www.gzip.org/zlib/)
@@ -43 +43 @@
 # SZIP from http://hdf.ncsa.uiuc.edu/
 #
-ln -sf "/c/program files/hdf/szip20-win-xp-enc/dll/szlibdll.dll" /usr/local/lib/libsz.dll
+ln -sf "/c/program files/hdf/szip20-win-xp-noenc/dll/szlibdll.dll" /usr/local/lib/libsz.dll
 #
 # LIBXML2 (optional; only needed for NXtranslate) from http://xmlsoft.org/