Mercurial > octave-nkf

diff configure.ac @ 18342:ee7f66925267 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Always build mkoctfile and octave-config as executables (bug #41296) * src/Makefile.am (bin_PROGRAMS): Add mkoctfile and octave-config unconditionally. (bin_SCRIPTS): Remove all references. (AMCOND_BUILD_COMPILED_AUX_PROGRAMS): Delete conditional sections. * src/mkoctfile.in.cc: Include <unistd.h>. * src/mkoctfile.in.sh, src/octave-config.in.sh: Delete. * configure.ac (AMCOND_BUILD_COMPILED_AUX_PROGRAMS): Delete.
author Mike Miller <mtmiller@ieee.org>
date Tue, 21 Jan 2014 22:40:29 -0500
parents 508f67c72854
children 26eac61ebab2 c460566106f0
line wrap: on
line diff
--- a/configure.ac	Sat Jan 04 14:37:59 2014 -0500
+++ b/configure.ac	Tue Jan 21 22:40:29 2014 -0500
@@ -1643,7 +1643,6 @@
 OCTGRAPHICS_DLL_DEFS=
 library_path_var=LD_LIBRARY_PATH
 ldpreloadsep=" "
-BUILD_COMPILED_AUX_PROGRAMS=no
 case $canonical_host_type in
   *-*-386bsd* | *-*-netbsd*)
     SH_LD=ld
@@ -1696,7 +1695,6 @@
     ldpreloadsep=":"
   ;;
   *-*-mingw*)
-    BUILD_COMPILED_AUX_PROGRAMS=yes
     if test $have_msvc = yes; then
       DL_LDFLAGS="-shared"
       CPICFLAG=
@@ -1737,7 +1735,6 @@
   ;;
 
   *-*-msdosmsvc)
-    BUILD_COMPILED_AUX_PROGRAMS=yes
     DL_LDFLAGS="-shared"
     CPICFLAG=
     CXXPICFLAG=
@@ -1834,9 +1831,6 @@
   ;;
 esac
 
-AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS],
-  [test $BUILD_COMPILED_AUX_PROGRAMS = yes])
-
 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG])
 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG])
 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG])