Changeset 19146

Timestamp:

02/20/15 15:15:17 (10 years ago)

Author:

glperez

Message:

CHG: Fixed an issue with AM_CONDITIONAL on without-wrappers build.

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (7 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -173 +173 @@
                         export CFLAGS="-DWIN32 -D_INTEL_WIN_"
                         export CXXFLAGS="-DWIN32 -D_INTEL_WIN_"
+                        IS_WINDOWS=yes
                 elif  test $VENDOR = intel-win7-32; then
                         export CC=cl
@@ -181 +182 @@
                         export OS_LDFLAG="-Wl,"
                         export RANLIB=true
+                        IS_WINDOWS=yes
                         OSLIBS="-Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib"
                 elif  test $VENDOR = intel-win7-64; then
@@ -190 +192 @@
                         export OS_LDFLAG="-Wl,"
                         export RANLIB=true
+                        IS_WINDOWS=yes
                         OSLIBS="-Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib"
                 elif  test $VENDOR = MSVC-Win64; then
@@ -199 +202 @@
                         export OS_LDFLAG="-Wl,"
                         export RANLIB=true
+                        IS_WINDOWS=yes
                         OSLIBS="-Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib"
                 elif test $VENDOR = intel-linux; then
@@ -275 +279 @@
                                         MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
                                         MEXEXT=".$MEXEXT"
-                                        IS_WINDOWS=yes
                                 elif test $VENDOR = intel-win7-64; then
                                         MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
                MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/export:mexFunction -Wl,/LD" 
                                         MEXEXT=".mexw64"
-                                        IS_WINDOWS=yes
                                 elif test $VENDOR = MSVC-Win64; then
                                         MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
                MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/export:mexFunction -Wl,/LD" 
                                         MEXEXT=".mexw64"
-                                        IS_WINDOWS=yes
                                 fi
                         ;;
@@ -314 +315 @@
            fi
 
-                AM_CONDITIONAL([WINDOWS], [test x$IS_WINDOWS = xyes])
+                AC_MSG_CHECKING([whether matlab is enabled])
 
                 AC_SUBST([MATLABINCL])
@@ -322 +323 @@
                 AC_SUBST([MEXLINK])
         fi
+        dnl }}}
+        dnl windows {{{
+        AC_MSG_CHECKING([Checking if this is a Win build... ])
+        AM_CONDITIONAL([WINDOWS], [test x$IS_WINDOWS = xyes])
+        AC_MSG_RESULT(done)
         dnl }}}
         dnl triangle {{{