comparison configure.in @ 255:084402c475ba r20-5b26

Import from CVS: tag r20-5b26
author cvs
date Mon, 13 Aug 2007 10:21:18 +0200
parents 677f6a0ee643
children 65c19d2020f7
comparison
equal deleted inserted replaced
254:e92abcaa252b 255:084402c475ba
1917 dnl ----------------------------------- 1917 dnl -----------------------------------
1918 1918
1919 dnl Do the opsystem or machine files prohibit the use of the GNU malloc? 1919 dnl Do the opsystem or machine files prohibit the use of the GNU malloc?
1920 dnl Assume not, until told otherwise. 1920 dnl Assume not, until told otherwise.
1921 GNU_MALLOC=yes 1921 GNU_MALLOC=yes
1922 doug_lea_malloc=yes
1923 AC_CHECK_FUNC(malloc_get_state, ,doug_lea_malloc=no)
1924 AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no)
1925 AC_MSG_CHECKING(whether __after_morecore_hook exists)
1926 AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0],
1927 [AC_MSG_RESULT(yes)],
1928 [AC_MSG_RESULT(no)
1929 doug_lea_malloc=no])
1922 if test "$system_malloc" = "yes" ; then 1930 if test "$system_malloc" = "yes" ; then
1923 GNU_MALLOC=no 1931 GNU_MALLOC=no
1924 GNU_MALLOC_reason=" 1932 GNU_MALLOC_reason="
1925 (The GNU allocators don't work with this system configuration)." 1933 (The GNU allocators don't work with this system configuration)."
1926 elif test "$with_system_malloc" = "yes" ; then 1934 elif test "$with_system_malloc" = "yes" ; then
1929 (User chose not to use GNU allocators)." 1937 (User chose not to use GNU allocators)."
1930 elif test "$with_debug_malloc" = "yes" ; then 1938 elif test "$with_debug_malloc" = "yes" ; then
1931 GNU_MALLOC=no 1939 GNU_MALLOC=no
1932 GNU_MALLOC_reason=" 1940 GNU_MALLOC_reason="
1933 (User chose to use Debugging Malloc)." 1941 (User chose to use Debugging Malloc)."
1942 fi
1943
1944 if test "$doug_lea_malloc" = "yes" ; then
1945 if test "$GNU_MALLOC" = yes ; then
1946 GNU_MALLOC_reason="
1947 (Using Doug Lea's new malloc from the GNU C Library.)"
1948 fi
1949 AC_DEFINE(DOUG_LEA_MALLOC)
1934 fi 1950 fi
1935 1951
1936 dnl Some other nice autoconf tests. If you add a test here which 1952 dnl Some other nice autoconf tests. If you add a test here which
1937 dnl should make an entry in src/config.h, do not forget to add an 1953 dnl should make an entry in src/config.h, do not forget to add an
1938 dnl #undef clause to src/config.h.in for autoconf to modify. 1954 dnl #undef clause to src/config.h.in for autoconf to modify.
2325 XE_SPACE(libs_xauth, $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS) 2341 XE_SPACE(libs_xauth, $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS)
2326 fi 2342 fi
2327 AC_SUBST(libs_xauth) 2343 AC_SUBST(libs_xauth)
2328 2344
2329 dnl Always compile OffiX except --without-offix is given or no 2345 dnl Always compile OffiX except --without-offix is given or no
2330 dnl x11 support is compiled in 2346 dnl x11 support is compiled in or no standard Xmu.
2331 OFFIX_O="" 2347 OFFIX_O=""
2332 test "$window_system" != "x11" && with_offix=no 2348 test "$window_system" != "x11" && with_offix=no
2349 if test "$with_xmu" != yes -a "$with_x11" = yes; then
2350 AC_MSG_WARN([No OffiX without real Xmu support])
2351 with_offix=no
2352 fi
2333 test -z "$with_offix" && with_offix=yes 2353 test -z "$with_offix" && with_offix=yes
2334 if test "$with_offix" = "yes"; then 2354 if test "$with_offix" = "yes"; then
2335 AC_DEFINE(HAVE_OFFIX_DND) 2355 AC_DEFINE(HAVE_OFFIX_DND)
2336 OFFIX_O="offix.o" 2356 OFFIX_O="offix.o"
2337 fi 2357 fi