Mercurial > hg > octave-lyh

changeset 9049:56018fcd28b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure fixes
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 27 Mar 2009 21:34:23 +0100
parents 867d5d1aed06
children e15f4197d907
files ChangeLog aclocal.m4 configure.in
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-27  Jaroslav Hajek <highegg@gmail.com>
+
+	* aclocal.m4 (OCTAVE_CMATH_FUNC): Add missing AC_LANG_POP.
+	* configure.in: Enclose string in quotes.
+
 2009-03-23  Jaroslav Hajek  <highegg@gmail.com>
 
 	* NEWS: More updates.
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1318,6 +1318,7 @@
 [AC_MSG_RESULT([yes])
  AC_DEFINE(HAVE_CMATH_[]AS_TR_CPP($1)F,1,[Define if <cmath> provides float variant of $1])],
 [AC_MSG_RESULT([no])])
+AC_LANG_POP(C++)
 ])
 
 dnl Check whether fast signed integer arithmetics using bit tricks
--- a/configure.in
+++ b/configure.in
@@ -266,7 +266,7 @@
 if test "$have_x"; then
   AC_DEFINE(HAVE_X_WINDOWS, 1, [Define if you have X11])
 
-  if test $x_includes != "NONE"; then
+  if test "$x_includes" != "NONE"; then
     X11_INCFLAGS="$x_includes"
   fi
   AC_SUBST(X11_INCFLAGS)