Changeset 1455

Timestamp:

12/04/10 12:32:54 (22 months ago)

Author:

Freddie Akeroyd

Message:

Remove /sw from mac. Refs #223

File:

• branches/4.2/configure.ac (modified) (2 diffs)

branches/4.2/configure.ac

@@ -599 +599 @@
 fi
 # for Mac/fink when hdf and hdf5 are not taken from fink, but jpeg is
-if test -d /sw/lib; then
-    LDFLAGS="$LDFLAGS -L/sw/lib"
-fi
+#if test -d /sw/lib; then
+#    LDFLAGS="$LDFLAGS -L/sw/lib"
+#fi
 # for Mac/Macports when you are not using fink at all.
-if test -d /opt/local/lib; then
-    LDFLAGS="$LDFLAGS -L/opt/local/lib"
-fi
+#if test -d /opt/local/lib; then
+#    LDFLAGS="$LDFLAGS -L/opt/local/lib"
+#fi
 
 # remove initial :
@@ -662 +662 @@
 AC_TYPE_LONG_LONG_INT
 AC_TYPE_UNSIGNED_LONG_LONG_INT
-AC_CHECK_SIZEOF([int])
-AC_CHECK_SIZEOF([long int])
-AC_CHECK_SIZEOF([long long int])
+dnl these are not compatible with cross architecture compiling
+if test x$cross_compiling != xyes; then
+    AC_CHECK_SIZEOF([int])
+    AC_CHECK_SIZEOF([long int])
+    AC_CHECK_SIZEOF([long long int])
+fi
 AC_STRUCT_TM