Mercurial > octave-nkf
comparison configure.in @ 9515:eee9b3150446
more configure tweaks
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 11 Aug 2009 19:30:37 -0400 |
parents | af86991d8d47 |
children | ee99f9f37505 |
comparison
equal
deleted
inserted
replaced
9514:af86991d8d47 | 9515:eee9b3150446 |
---|---|
1705 | 1705 |
1706 if $SHARED_LIBS || $ENABLE_DYNAMIC_LINKING; then | 1706 if $SHARED_LIBS || $ENABLE_DYNAMIC_LINKING; then |
1707 | 1707 |
1708 ## Check for dyld first since OS X can have a non-standard libdl | 1708 ## Check for dyld first since OS X can have a non-standard libdl |
1709 | 1709 |
1710 AC_CHECK_HEADER(mach-o/dyld.h) | 1710 save_LIBS="$LIBS" |
1711 AC_CHECK_HEADER(mach-o/dyld.h) | |
1711 if test "$ac_cv_header_mach_o_dyld_h" = yes; then | 1712 if test "$ac_cv_header_mach_o_dyld_h" = yes; then |
1712 dyld_api=true | 1713 dyld_api=true |
1713 else | 1714 else |
1714 AC_CHECK_LIB(dld, shl_load) | 1715 AC_CHECK_LIB(dld, shl_load, [DL_LIBS=-ldld; LIBS="$LIBS $DL_LIBS"]) |
1715 AC_CHECK_FUNCS(shl_load shl_findsym) | 1716 AC_CHECK_FUNCS(shl_load shl_findsym) |
1716 if test "$ac_cv_func_shl_load" = yes \ | 1717 if test "$ac_cv_func_shl_load" = yes \ |
1717 && test "$ac_cv_func_shl_findsym" = yes; then | 1718 && test "$ac_cv_func_shl_findsym" = yes; then |
1718 shl_load_api=true | 1719 shl_load_api=true |
1719 else | 1720 else |
1720 AC_CHECK_LIB(wsock32, LoadLibrary) | 1721 AC_CHECK_LIB(wsock32, LoadLibrary, [ |
1722 DL_LIBS=-lwsock32; LIBS="$LIBS $DL_LIBS"]) | |
1721 AC_CHECK_FUNCS(LoadLibrary) | 1723 AC_CHECK_FUNCS(LoadLibrary) |
1722 if test "$ac_cv_func_loadlibrary" = yes; then | 1724 if test "$ac_cv_func_loadlibrary" = yes; then |
1723 loadlibrary_api=true | 1725 loadlibrary_api=true |
1724 else | 1726 else |
1725 AC_CHECK_LIB(dl, dlopen) | 1727 AC_CHECK_LIB(dl, dlopen, [DL_LIBS=-ldl; LIBS="$LIBS $DL_LIBS"]) |
1726 AC_CHECK_FUNCS(dlopen dlsym dlerror dlclose) | 1728 AC_CHECK_FUNCS(dlopen dlsym dlerror dlclose) |
1727 if test "$ac_cv_func_dlclose" = yes \ | 1729 if test "$ac_cv_func_dlclose" = yes \ |
1728 && test "$ac_cv_func_dlerror" = yes \ | 1730 && test "$ac_cv_func_dlerror" = yes \ |
1729 && test "$ac_cv_func_dlopen" = yes \ | 1731 && test "$ac_cv_func_dlopen" = yes \ |
1730 && test "$ac_cv_func_dlsym" = yes; then | 1732 && test "$ac_cv_func_dlsym" = yes; then |
1738 esac | 1740 esac |
1739 fi | 1741 fi |
1740 fi | 1742 fi |
1741 fi | 1743 fi |
1742 fi | 1744 fi |
1745 LIBS="$save_LIBS" | |
1746 AC_SUBST(DL_LIBS) | |
1743 | 1747 |
1744 ## autoconf test for LoadLibrary appears broken. Bypass for cygwin/mingw | 1748 ## autoconf test for LoadLibrary appears broken. Bypass for cygwin/mingw |
1745 if $dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api; then | 1749 if $dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api; then |
1746 true | 1750 true |
1747 else | 1751 else |
1888 # mkdir takes a single argument on some systems. | 1892 # mkdir takes a single argument on some systems. |
1889 OCTAVE_MKDIR_TAKES_ONE_ARG | 1893 OCTAVE_MKDIR_TAKES_ONE_ARG |
1890 | 1894 |
1891 octave_found_termlib=no | 1895 octave_found_termlib=no |
1892 for termlib in ncurses curses termcap terminfo termlib; do | 1896 for termlib in ncurses curses termcap terminfo termlib; do |
1893 AC_CHECK_LIB(${termlib}, tputs, [TERMLIBS="${TERMLIBS} -l${termlib}"]) | 1897 AC_CHECK_LIB(${termlib}, tputs, [ |
1894 case "${TERMLIBS}" in | 1898 TERM_LIBS="-l${termlib}" |
1895 *-l${termlib}*) | 1899 octave_found_termlib=yes |
1896 LIBS="$TERMLIBS $LIBS" | 1900 break]) |
1897 AC_SUBST(TERMLIBS) | |
1898 octave_found_termlib=yes | |
1899 break | |
1900 ;; | |
1901 esac | |
1902 done | 1901 done |
1903 | 1902 |
1904 if test "$octave_found_termlib" = no; then | 1903 if test "$octave_found_termlib" = no; then |
1905 warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, o\ | 1904 warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, o\ |
1906 r -ltermlib!" | 1905 r -ltermlib!" |
1907 AC_MSG_WARN($warn_termlibs) | 1906 AC_MSG_WARN($warn_termlibs) |
1908 fi | 1907 fi |
1908 AC_SUBST(TERM_LIBS) | |
1909 | 1909 |
1910 OCTAVE_ENABLE_READLINE | 1910 OCTAVE_ENABLE_READLINE |
1911 | 1911 |
1912 AC_MSG_CHECKING([for struct exception in math.h]) | 1912 AC_MSG_CHECKING([for struct exception in math.h]) |
1913 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], | 1913 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], |
2228 OPENGL libraries: $OPENGL_LIBS | 2228 OPENGL libraries: $OPENGL_LIBS |
2229 FLTK backend libs: $GRAPHICS_LIBS | 2229 FLTK backend libs: $GRAPHICS_LIBS |
2230 X11 include flags: $X11_INCFLAGS | 2230 X11 include flags: $X11_INCFLAGS |
2231 X11 libraries: $X11_LIBS | 2231 X11 libraries: $X11_LIBS |
2232 CARBON libraries: $CARBON_LIBS | 2232 CARBON libraries: $CARBON_LIBS |
2233 PTHREAD flags $PTHREAD_CFLAGS | 2233 PTHREAD flags: $PTHREAD_CFLAGS |
2234 PTHREAD libraries $PTHREAD_LIBS | 2234 PTHREAD libraries: $PTHREAD_LIBS |
2235 READLINE libraries: $READLINE_LIBS | |
2236 TERM libraries: $TERM_LIBS | |
2237 DL libraries: $DL_LIBS | |
2235 LIBS: $LIBS | 2238 LIBS: $LIBS |
2236 Default pager: $DEFAULT_PAGER | 2239 Default pager: $DEFAULT_PAGER |
2237 gnuplot: $GNUPLOT | 2240 gnuplot: $GNUPLOT |
2238 Magick config: $MAGICK_CONFIG | 2241 Magick config: $MAGICK_CONFIG |
2239 | 2242 |