Mercurial > octave-nkf

comparison 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
comparison
equal deleted inserted replaced
18330:200851c87444 18342:ee7f66925267
1641 OCTINTERP_DLL_DEFS= 1641 OCTINTERP_DLL_DEFS=
1642 OCTGUI_DLL_DEFS= 1642 OCTGUI_DLL_DEFS=
1643 OCTGRAPHICS_DLL_DEFS= 1643 OCTGRAPHICS_DLL_DEFS=
1644 library_path_var=LD_LIBRARY_PATH 1644 library_path_var=LD_LIBRARY_PATH
1645 ldpreloadsep=" " 1645 ldpreloadsep=" "
1646 BUILD_COMPILED_AUX_PROGRAMS=no
1647 case $canonical_host_type in 1646 case $canonical_host_type in
1648 *-*-386bsd* | *-*-netbsd*) 1647 *-*-386bsd* | *-*-netbsd*)
1649 SH_LD=ld 1648 SH_LD=ld
1650 SH_LDFLAGS=-Bshareable 1649 SH_LDFLAGS=-Bshareable
1651 ;; 1650 ;;
1694 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" 1693 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
1695 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a' 1694 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a'
1696 ldpreloadsep=":" 1695 ldpreloadsep=":"
1697 ;; 1696 ;;
1698 *-*-mingw*) 1697 *-*-mingw*)
1699 BUILD_COMPILED_AUX_PROGRAMS=yes
1700 if test $have_msvc = yes; then 1698 if test $have_msvc = yes; then
1701 DL_LDFLAGS="-shared" 1699 DL_LDFLAGS="-shared"
1702 CPICFLAG= 1700 CPICFLAG=
1703 CXXPICFLAG= 1701 CXXPICFLAG=
1704 FPICFLAG= 1702 FPICFLAG=
1735 library_path_var=PATH 1733 library_path_var=PATH
1736 fi 1734 fi
1737 ;; 1735 ;;
1738 1736
1739 *-*-msdosmsvc) 1737 *-*-msdosmsvc)
1740 BUILD_COMPILED_AUX_PROGRAMS=yes
1741 DL_LDFLAGS="-shared" 1738 DL_LDFLAGS="-shared"
1742 CPICFLAG= 1739 CPICFLAG=
1743 CXXPICFLAG= 1740 CXXPICFLAG=
1744 FPICFLAG= 1741 FPICFLAG=
1745 SHLEXT=dll 1742 SHLEXT=dll
1831 TEMPLATE_AR='$(CXX)' 1828 TEMPLATE_AR='$(CXX)'
1832 TEMPLATE_ARFLAGS="-xar -o" 1829 TEMPLATE_ARFLAGS="-xar -o"
1833 fi 1830 fi
1834 ;; 1831 ;;
1835 esac 1832 esac
1836
1837 AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS],
1838 [test $BUILD_COMPILED_AUX_PROGRAMS = yes])
1839 1833
1840 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) 1834 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG])
1841 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) 1835 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG])
1842 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG]) 1836 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG])
1843 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT]) 1837 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT])