Changeset 1058

Timestamp:

Jun 23, 2008, 2:13:23 PM (16 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• configure (modified) (6 diffs)
• configure.in (modified) (3 diffs)

trunk/configure

@@ -722 +722 @@
 INSTALL_LIB
 INSTALL_STUB_LIB
+MAKE
 ENABLE_GUI
 TCLSH
@@ -756 +757 @@
 with_tclsh
 with_matlab
-with_matlab_arch
-with_mexext
 with_octave
 with_perl
@@ -1415 +1414 @@
   --with-tclsh=DIR        location of tclsh [default=check]
   --with-matlab=DIR       location of matlab and mex compiler [default=check]
-  --with-matlab-arch=ARCH build Matlab bindings for ARCH architecture
-                          [default=check]
-  --with-mexext=ARCH      fallback extension for building mex files
-                          [default=check]
   --with-octave=DIR       location of octave compiler MKOCTFILE
                           [default=check]
@@ -8458 +8453 @@
 
 
+make_command=""
+for m in "$MAKE" make gmake gnumake ; do
+  if test "x${m}" != "x" ; then
+    if  ( sh -c "$m --version" 2>/dev/null | grep GNU >/dev/null ) ; then
+      make_command=$m; break;
+    fi
+  fi
+done
+if test "x${make_command}" = "x" ; then
+  { { $as_echo "$as_me:$LINENO: error: Requires GNU make. You can specify a version with \$MAKE" >&5
+$as_echo "$as_me: error: Requires GNU make. You can specify a version with \$MAKE" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+MAKE=${make_command}
+
+
 # Check whether --enable-gui was given.
 if test "${enable_gui+set}" = set; then
@@ -8546 +8557 @@
 
 
-
 # Check whether --with-matlab was given.
 if test "${with_matlab+set}" = set; then
-  withval=$with_matlab;
-else
-  with_matlab=check
-fi
-
-
-
-# Check whether --with-matlab_arch was given.
-if test "${with_matlab_arch+set}" = set; then
-  withval=$with_matlab_arch;
-else
-  with_matlab_arch=check
-fi
-
-
-
-# Check whether --with-mexext was given.
-if test "${with_mexext+set}" = set; then
-  withval=$with_mexext;
-else
-  with_mexext=check
+  withval=$with_matlab; with_matlab=$withval
+else
+  with_matlab=yes
 fi
 
@@ -8643 +8635 @@
 # Check whether --with-octave was given.
 if test "${with_octave+set}" = set; then
-  withval=$with_octave;
-else
-  with_octave=check
+  withval=$with_octave; with_octave=$withval
+else
+  with_octave=yes
 fi
 

trunk/configure.in

@@ -49 +49 @@
 
 SC_CONFIG_CFLAGS
+
+make_command=""
+for m in "$MAKE" make gmake gnumake ; do 
+  if test "x${m}" != "x" ; then 
+    if  ( sh -c "$m --version" 2>/dev/null | grep GNU >/dev/null ) ; then 
+      make_command=$m; break;
+    fi
+  fi
+done
+if test "x${make_command}" = "x" ; then
+  AC_ERROR([Requires GNU make. You can specify a version with \$MAKE])
+fi
+AC_SUBST(MAKE, ${make_command})
 
 AC_ARG_ENABLE(
@@ -100 +113 @@
 
 
-dnl AC_ARG_ENABLE (
-dnl     [matlab],
-dnl     [AS_HELP_STRING([--enable-matlab], [build matlab bindings @<:@default=check@:>@])],
-dnl     [],
-dnl     [enable_matlab=check])
-dnl BUILD_MATLAB=yes
-dnl AC_SUBST(BUILD_MATLAB)
-
 AC_ARG_WITH(
     [matlab],
     [AS_HELP_STRING([--with-matlab[=DIR]],
         [location of matlab and mex compiler @<:@default=check@:>@])],
-    [],
-    [with_matlab=check])
-
-AC_ARG_WITH(
-    [matlab_arch],
-    [AS_HELP_STRING([--with-matlab-arch[=ARCH]],
-        [build Matlab bindings for ARCH architecture @<:@default=check@:>@])],
-    [],
-    [with_matlab_arch=check])
-
-AC_ARG_WITH(
-    [mexext],
-    [AS_HELP_STRING([--with-mexext[=ARCH]],
-        [fallback extension for building mex files @<:@default=check@:>@])],
-    [],
-    [with_mexext=check])
+    [with_matlab=$withval],
+    [with_matlab=yes])
 
 MEX=""
@@ -157 +148 @@
     [AS_HELP_STRING([--with-octave[=DIR]],
         [location of octave compiler MKOCTFILE @<:@default=check@:>@])],
-    [],
-    [with_octave=check])
+    [with_octave=$withval],
+    [with_octave=yes])
 
 MKOCTFILE=