changeset 15933:58018d0e9a71

maint: Periodic merge of stable to default.
author Rik <rik@octave.org>
date Sat, 12 Jan 2013 07:36:14 -0800
parents 450e4e60d2c9 (current diff) 747dd82082c8 (diff)
children f6a0e7741a77 0cbac4d3a81c
files build-aux/common.mk configure.ac liboctave/util/lo-cutils.h src/mkoctfile.in.cc src/mkoctfile.in.sh
diffstat 2 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/common.mk	Fri Jan 11 22:12:12 2013 -0500
+++ b/build-aux/common.mk	Sat Jan 12 07:36:14 2013 -0800
@@ -165,6 +165,15 @@
 
 # List of libraries and their special compilation flags
 
+MKOCTFILE_CC = @MKOCTFILE_CC@
+MKOCTFILE_CXX = @MKOCTFILE_CXX@
+MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@
+MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@
+MKOCTFILE_F77 = @MKOCTFILE_F77@
+MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@
+
+# List of libraries and their special compilation flags
+
 LIBOCTINTERP = @LIBOCTINTERP@
 LIBOCTAVE = @LIBOCTAVE@
 
--- a/configure.ac	Fri Jan 11 22:12:12 2013 -0500
+++ b/configure.ac	Sat Jan 12 07:36:14 2013 -0800
@@ -1841,6 +1841,9 @@
 
 ### Check for existence of various libraries
 
+
+### Check for existence of various libraries
+
 ## OS-specific test for dirent, opendir.
 case $host_os in
   mingw*)