# HG changeset patch # User Rik # Date 1358004974 28800 # Node ID 58018d0e9a715098b635c5bcbac6b3f3ef080cbd # Parent 450e4e60d2c95e6ae192f4a61a759078645bd36e# Parent 747dd82082c80b89c4ede2fabe290ba906c5796c maint: Periodic merge of stable to default. diff --git a/build-aux/common.mk b/build-aux/common.mk --- a/build-aux/common.mk +++ b/build-aux/common.mk @@ -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@ diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -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*) diff --git a/liboctave/util/lo-cutils.h b/liboctave/util/lo-cutils.h diff --git a/src/mkoctfile.in.cc b/src/mkoctfile.in.cc diff --git a/src/mkoctfile.in.sh b/src/mkoctfile.in.sh