comparison configure.ac @ 18351:cd897532aaec

maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Thu, 23 Jan 2014 16:16:07 -0500
parents 7a1a71e3f328 26eac61ebab2
children c9b284dd28c6
comparison
equal deleted inserted replaced
18348:052cc933aea6 18351:cd897532aaec
1634 OCTINTERP_DLL_DEFS= 1634 OCTINTERP_DLL_DEFS=
1635 OCTGUI_DLL_DEFS= 1635 OCTGUI_DLL_DEFS=
1636 OCTGRAPHICS_DLL_DEFS= 1636 OCTGRAPHICS_DLL_DEFS=
1637 library_path_var=LD_LIBRARY_PATH 1637 library_path_var=LD_LIBRARY_PATH
1638 ldpreloadsep=" " 1638 ldpreloadsep=" "
1639 BUILD_COMPILED_AUX_PROGRAMS=no
1640 case $canonical_host_type in 1639 case $canonical_host_type in
1641 *-*-386bsd* | *-*-netbsd*) 1640 *-*-386bsd* | *-*-netbsd*)
1642 SH_LD=ld 1641 SH_LD=ld
1643 SH_LDFLAGS=-Bshareable 1642 SH_LDFLAGS=-Bshareable
1644 ;; 1643 ;;
1687 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" 1686 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
1688 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a' 1687 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a'
1689 ldpreloadsep=":" 1688 ldpreloadsep=":"
1690 ;; 1689 ;;
1691 *-*-mingw*) 1690 *-*-mingw*)
1692 BUILD_COMPILED_AUX_PROGRAMS=yes
1693 if test $have_msvc = yes; then 1691 if test $have_msvc = yes; then
1694 DL_LDFLAGS="-shared" 1692 DL_LDFLAGS="-shared"
1695 CPICFLAG= 1693 CPICFLAG=
1696 CXXPICFLAG= 1694 CXXPICFLAG=
1697 FPICFLAG= 1695 FPICFLAG=
1728 library_path_var=PATH 1726 library_path_var=PATH
1729 fi 1727 fi
1730 ;; 1728 ;;
1731 1729
1732 *-*-msdosmsvc) 1730 *-*-msdosmsvc)
1733 BUILD_COMPILED_AUX_PROGRAMS=yes
1734 DL_LDFLAGS="-shared" 1731 DL_LDFLAGS="-shared"
1735 CPICFLAG= 1732 CPICFLAG=
1736 CXXPICFLAG= 1733 CXXPICFLAG=
1737 FPICFLAG= 1734 FPICFLAG=
1738 SHLEXT=dll 1735 SHLEXT=dll
1824 TEMPLATE_AR='$(CXX)' 1821 TEMPLATE_AR='$(CXX)'
1825 TEMPLATE_ARFLAGS="-xar -o" 1822 TEMPLATE_ARFLAGS="-xar -o"
1826 fi 1823 fi
1827 ;; 1824 ;;
1828 esac 1825 esac
1829
1830 AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS],
1831 [test $BUILD_COMPILED_AUX_PROGRAMS = yes])
1832 1826
1833 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) 1827 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG])
1834 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) 1828 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG])
1835 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG]) 1829 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG])
1836 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT]) 1830 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT])