Consolidate all octave related m4 macros into a single file.

5 files changed, 83 insertions, 83 deletions

diff --git a/M4/Makefile.am b/M4/Makefile.am
index 210ebea..3ea1b7f 100644
--- a/M4/Makefile.am
+++ b/M4/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = add_cflags.m4 clip_mode.m4 endian.m4 extra_largefile.m4 \
-	flexible_array.m4 llrint.m4 lrint.m4 lrintf.m4
+	flexible_array.m4 llrint.m4 lrint.m4 lrintf.m4 octave.m4
 
diff --git a/M4/octave_build.m4 b/M4/octave.m4
index 6ae34af..ba5d742 100644
--- a/M4/octave_build.m4
+++ b/M4/octave.m4
@@ -1,3 +1,85 @@
+dnl Evaluate an expression in octave
+dnl
+dnl OCTAVE_EVAL(expr,var) -> var=expr
+dnl
+dnl Stolen from octave-forge
+
+AC_DEFUN([OCTAVE_EVAL],
+[
+AC_MSG_CHECKING([for $1 in $OCTAVE])
+$2=`echo "disp($1)" | $OCTAVE -qfH`
+AC_MSG_RESULT($$2)
+AC_SUBST($2)
+]) # OCTAVE_EVAL
+
+dnl @synopsis AC_OCTAVE_VERSION
+dnl
+dnl Find the version of Octave.
+dnl @version 1.0	Aug 23 2007
+dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this file for any 
+dnl purpose is hereby granted without fee, provided that the above copyright 
+dnl and this permission notice appear in all copies.  No representations are
+dnl made about the suitability of this software for any purpose.  It is 
+dnl provided "as is" without express or implied warranty.
+dnl
+
+AC_DEFUN([AC_OCTAVE_VERSION],
+[
+
+AC_ARG_WITH(octave,
+	[  --with-octave           choose the octave version], [ with_octave=$withval ])
+
+test -z "$with_octave" && with_octave=octave
+
+AC_CHECK_PROG(HAVE_OCTAVE,$with_octave,yes,no)
+
+if test "x$ac_cv_prog_HAVE_OCTAVE" = "xyes" ; then
+	OCTAVE=$with_octave
+	OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION)
+	fi
+
+AC_SUBST(OCTAVE)
+AC_SUBST(OCTAVE_VERSION)
+
+])# AC_OCTAVE_VERSION
+
+dnl @synopsis AC_OCTAVE_CONFIG_VERSION
+dnl
+dnl Find the version of Octave.
+dnl @version 1.0	Aug 23 2007
+dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this file for any 
+dnl purpose is hereby granted without fee, provided that the above copyright 
+dnl and this permission notice appear in all copies.  No representations are
+dnl made about the suitability of this software for any purpose.  It is 
+dnl provided "as is" without express or implied warranty.
+dnl
+
+AC_DEFUN([AC_OCTAVE_CONFIG_VERSION],
+[
+
+AC_ARG_WITH(octave-config,
+	[  --with-octave-config    choose the octave-config version], [ with_octave_config=$withval ])
+
+test -z "$with_octave_config" && with_octave_config=octave-config
+
+AC_CHECK_PROG(HAVE_OCTAVE_CONFIG,$with_octave_config,yes,no)
+
+if test "x$ac_cv_prog_HAVE_OCTAVE_CONFIG" = "xyes" ; then
+	OCTAVE_CONFIG=$with_octave_config
+	AC_MSG_CHECKING([for version of $OCTAVE_CONFIG])
+	OCTAVE_CONFIG_VERSION=`$OCTAVE_CONFIG --version`
+	AC_MSG_RESULT($OCTAVE_CONFIG_VERSION)
+	fi
+
+AC_SUBST(OCTAVE_CONFIG)
+AC_SUBST(OCTAVE_CONFIG_VERSION)
+
+])# AC_OCTAVE_CONFIG_VERSION
+
 dnl @synopsis AC_OCTAVE_BUILD
 dnl
 dnl Check programs and headers required for building octave plugins.
diff --git a/M4/octave_config_version.m4 b/M4/octave_config_version.m4
deleted file mode 100644
index 82bfd22..0000000
--- a/M4/octave_config_version.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-dnl @synopsis AC_OCTAVE_CONFIG_VERSION
-dnl
-dnl Find the version of Octave.
-dnl @version 1.0	Aug 23 2007
-dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this file for any 
-dnl purpose is hereby granted without fee, provided that the above copyright 
-dnl and this permission notice appear in all copies.  No representations are
-dnl made about the suitability of this software for any purpose.  It is 
-dnl provided "as is" without express or implied warranty.
-dnl
-
-AC_DEFUN([AC_OCTAVE_CONFIG_VERSION],
-[
-
-AC_ARG_WITH(octave-config,
-	[  --with-octave-config    choose the octave-config version], [ with_octave_config=$withval ])
-
-test -z "$with_octave_config" && with_octave_config=octave-config
-
-AC_CHECK_PROG(HAVE_OCTAVE_CONFIG,$with_octave_config,yes,no)
-
-if test "x$ac_cv_prog_HAVE_OCTAVE_CONFIG" = "xyes" ; then
-	OCTAVE_CONFIG=$with_octave_config
-	AC_MSG_CHECKING([for version of $OCTAVE_CONFIG])
-	OCTAVE_CONFIG_VERSION=`$OCTAVE_CONFIG --version`
-	AC_MSG_RESULT($OCTAVE_CONFIG_VERSION)
-	fi
-
-AC_SUBST(OCTAVE_CONFIG)
-AC_SUBST(OCTAVE_CONFIG_VERSION)
-
-])# AC_OCTAVE_CONFIG_VERSION
-
diff --git a/M4/octave_eval.m4 b/M4/octave_eval.m4
deleted file mode 100644
index 6b92223..0000000
--- a/M4/octave_eval.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-dnl Evaluate an expression in octave
-dnl
-dnl OCTAVE_EVAL(expr,var) -> var=expr
-dnl
-dnl Stolen from octave-forge
-
-AC_DEFUN([OCTAVE_EVAL],
-[
-AC_MSG_CHECKING([for $1 in $OCTAVE])
-$2=`echo "disp($1)" | $OCTAVE -qfH`
-AC_MSG_RESULT($$2)
-AC_SUBST($2)
-]) # OCTAVE_EVAL
-
diff --git a/M4/octave_version.m4 b/M4/octave_version.m4
deleted file mode 100644
index ba80ea9..0000000
--- a/M4/octave_version.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-dnl @synopsis AC_OCTAVE_VERSION
-dnl
-dnl Find the version of Octave.
-dnl @version 1.0	Aug 23 2007
-dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this file for any 
-dnl purpose is hereby granted without fee, provided that the above copyright 
-dnl and this permission notice appear in all copies.  No representations are
-dnl made about the suitability of this software for any purpose.  It is 
-dnl provided "as is" without express or implied warranty.
-dnl
-
-AC_DEFUN([AC_OCTAVE_VERSION],
-[
-
-AC_ARG_WITH(octave,
-	[  --with-octave           choose the octave version], [ with_octave=$withval ])
-
-test -z "$with_octave" && with_octave=octave
-
-AC_CHECK_PROG(HAVE_OCTAVE,$with_octave,yes,no)
-
-if test "x$ac_cv_prog_HAVE_OCTAVE" = "xyes" ; then
-	OCTAVE=$with_octave
-	OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION)
-	fi
-
-AC_SUBST(OCTAVE)
-AC_SUBST(OCTAVE_VERSION)
-
-])# AC_OCTAVE_VERSION
-