Mercurial > octave

diff configure.ac @ 23434:f4d4d83f15c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: rename cruft/ directory to external/ * liboctave/external: Renamed from liboctave/cruft. * * configure.ac: Rename XTRA_CRUFT_SH_LDFLAGS to XTRA_EXTERNAL_SH_LDFLAGS. Rename CRUFT_DLL_DEFS to EXTERNAL_DLL_DEFS. * install.txi: Update documentation to refer to liboctave/external. * HACKING: Update explanation of directory tree. * liboctave/module.mk: Update build system to include liboctave/external * liboctave/numeric/module.mk: Update CPPFLAGS to find Faddeeva in external/ directory. * lo-blas-proto.h, lo-lapack-proto.h: Update comments which referred to cruft directory.
author Rik <rik@octave.org>
date Mon, 24 Apr 2017 21:03:38 -0700
parents 58d56f52d50a
children af2f1f3dbe06
line wrap: on
line diff
--- a/configure.ac	Mon Apr 24 17:20:37 2017 -0700
+++ b/configure.ac	Mon Apr 24 21:03:38 2017 -0700
@@ -582,12 +582,12 @@
 fi
 AC_SUBST(STATIC_LIBS)
 
-XTRA_CRUFT_SH_LDFLAGS=
+XTRA_EXTERNAL_SH_LDFLAGS=
 if test $have_msvc = yes; then
   FLIBS="$FLIBS -lkernel32"
-  XTRA_CRUFT_SH_LDFLAGS="-Wl,cruft/cruft.def"
+  XTRA_EXTERNAL_SH_LDFLAGS="-Wl,external/external.def"
 fi
-AC_SUBST(XTRA_CRUFT_SH_LDFLAGS)
+AC_SUBST(XTRA_EXTERNAL_SH_LDFLAGS)
 
 ### Enable dynamic linking.  --enable-shared implies this, so
 ### --enable-dl is only need if you are only building static libraries
@@ -619,7 +619,7 @@
 NO_OCT_FILE_STRIP=false
 TEMPLATE_AR="${AR}"
 TEMPLATE_ARFLAGS="$ARFLAGS"
-CRUFT_DLL_DEFS=
+EXTERNAL_DLL_DEFS=
 OCTAVE_DLL_DEFS=
 OCTINTERP_DLL_DEFS=
 OCTGUI_DLL_DEFS=
@@ -681,7 +681,7 @@
       NO_OCT_FILE_STRIP=true
       library_path_var=PATH
       ## Extra compilation flags.
-      CRUFT_DLL_DEFS="-DCRUFT_DLL"
+      EXTERNAL_DLL_DEFS="-DEXTERNAL_DLL"
       OCTAVE_DLL_DEFS="-DOCTAVE_DLL"
       OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL"
       OCTGUI_DLL_DEFS="-DOCTGUI_DLL"
@@ -709,7 +709,7 @@
     NO_OCT_FILE_STRIP=true
     library_path_var=PATH
     ## Extra compilation flags.
-    CRUFT_DLL_DEFS="-DCRUFT_DLL"
+    EXTERNAL_DLL_DEFS="-DEXTERNAL_DLL"
     OCTAVE_DLL_DEFS="-DOCTAVE_DLL"
     OCTGUI_DLL_DEFS="-DOCTGUI_DLL"
     OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL"
@@ -794,7 +794,7 @@
 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP])
 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR])
 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS])
-AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS])
+AC_MSG_NOTICE([defining EXTERNAL_DLL_DEFS to be $EXTERNAL_DLL_DEFS])
 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS])
 AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS])
 AC_MSG_NOTICE([defining OCTGUI_DLL_DEFS to be $OCTGUI_DLL_DEFS])
@@ -811,7 +811,7 @@
 AC_SUBST(NO_OCT_FILE_STRIP)
 AC_SUBST(TEMPLATE_AR)
 AC_SUBST(TEMPLATE_ARFLAGS)
-AC_SUBST(CRUFT_DLL_DEFS)
+AC_SUBST(EXTERNAL_DLL_DEFS)
 AC_SUBST(OCTAVE_DLL_DEFS)
 AC_SUBST(OCTINTERP_DLL_DEFS)
 AC_SUBST(OCTGUI_DLL_DEFS)
@@ -1569,7 +1569,7 @@
 AC_SUBST(FFTW_XLDFLAGS)
 AC_SUBST(FFTW_XLIBS)
 
-## Subdirectory of liboctave/cruft to build if FFTW is not found.
+## Subdirectory of liboctave/external to build if FFTW is not found.
 FFT_DIR="fftpack"
 AC_SUBST(FFT_DIR)