Changeset 171 for trunk/aclocal.m4


Ignore:
Timestamp:
Jul 8, 2008, 11:16:14 AM (14 years ago)
Author:
katerina
Message:

Include dnmalloc (ticket #108) and fix bugs #106 (EINPROGRESS) and #107 (compressBound).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/aclocal.m4

    r170 r171  
    409409x_libraries=NONE
    410410DESTDIR=
    411 SH_ENABLE_OPTS="db-reload xml-log message-queue login-watch process-check port-check mounts-check userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp"
     411SH_ENABLE_OPTS="db-reload xml-log message-queue login-watch process-check port-check mounts-check userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc"
    412412SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver kcheck gpg checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file"
    413413
     
    11831183
    11841184
     1185AC_DEFUN([GCC_PIE_CC],[
     1186  AC_LANG_ASSERT(C)
     1187  if test "X$CC" != "X"; then
     1188    AC_CACHE_CHECK([whether ${CC} accepts -pie -fPIE],
     1189      pie_cv_cc,
     1190      [pie_old_cflags="$CFLAGS"
     1191       CFLAGS="$CFLAGS -pie -fPIE"
     1192       AC_TRY_COMPILE(,, pie_cv_cc=yes, pie_cv_cc=no)
     1193       CFLAGS="$pie_old_cflags"
     1194      ])
     1195    if test $pie_cv_cc = yes; then
     1196      PIE_CFLAGS="-fPIE"
     1197      PIE_LDFLAGS="-pie"
     1198    fi
     1199  fi
     1200])
    11851201
    11861202AC_DEFUN([SAMHAIN_POSIX],[
     
    18441860fi
    18451861
     1862if test x"$acx_pthread_ok" = xyes; then
     1863   PTHREAD_CFLAGS="${PTHREAD_CFLAGS} -DUSE_MALLOC_LOCK=1"
     1864fi
     1865
    18461866AC_SUBST(PTHREAD_LIBS)
    18471867AC_SUBST(PTHREAD_CFLAGS)
     
    19051925        AC_MSG_CHECKING([zlib in ${ZLIB_HOME}])
    19061926        AC_MSG_RESULT(ok)
     1927        AC_CHECK_FUNCS([compressBound])
    19071928        zlib_found=yes
    19081929else
     
    19191940])
    19201941
     1942# SH_PROG_LD
     1943# ----------
     1944# find the pathname to the GNU or non-GNU linker
     1945AC_DEFUN([SH_PROG_LD],
     1946[
     1947AC_REQUIRE([AC_PROG_CC])dnl
     1948AC_REQUIRE([AC_CANONICAL_HOST])dnl
     1949AC_REQUIRE([AC_CANONICAL_BUILD])dnl
     1950ac_prog=ld
     1951if test "$GCC" = yes; then
     1952  # Check if gcc -print-prog-name=ld gives a path.
     1953  AC_MSG_CHECKING([for ld used by $CC])
     1954  case $host in
     1955  *-*-mingw*)
     1956    # gcc leaves a trailing carriage return which upsets mingw
     1957    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
     1958  *)
     1959    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
     1960  esac
     1961  case $ac_prog in
     1962    # Accept absolute paths.
     1963    [[\\/]]* | ?:[[\\/]]*)
     1964      re_direlt='/[[^/]][[^/]]*/\.\./'
     1965      # Canonicalize the pathname of ld
     1966      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
     1967      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
     1968        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
     1969      done
     1970      test -z "$LD" && LD="$ac_prog"
     1971      ;;
     1972  "")
     1973    # If it fails, then pretend we aren't using GCC.
     1974    ac_prog=ld
     1975    ;;
     1976  *)
     1977    # If it is relative, then search for the first ld in PATH.
     1978    with_gnu_ld=unknown
     1979    ;;
     1980  esac
     1981else
     1982  AC_MSG_CHECKING([for ld])
     1983fi
     1984AC_CACHE_VAL(lt_cv_path_LD,
     1985[if test -z "$LD"; then
     1986  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
     1987  for ac_dir in $PATH; do
     1988    IFS="$lt_save_ifs"
     1989    test -z "$ac_dir" && ac_dir=.
     1990    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
     1991      lt_cv_path_LD="$ac_dir/$ac_prog"
     1992      # Check to see if the program is GNU ld.  I'd rather use --version,
     1993      # but apparently some variants of GNU ld only accept -v.
     1994      # Break only if it was the GNU/non-GNU ld that we prefer.
     1995      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
     1996      *GNU* | *'with BFD'*)
     1997        with_gnu_ld=yes
     1998        ;;
     1999      *)
     2000        with_gnu_ld=no
     2001        ;;
     2002      esac
     2003    fi
     2004  done
     2005  IFS="$lt_save_ifs"
     2006else
     2007  lt_cv_path_LD="$LD" # Let the user override the test with a path.
     2008fi])
     2009LD="$lt_cv_path_LD"
     2010if test -n "$LD"; then
     2011  AC_MSG_RESULT($LD)
     2012else
     2013  AC_MSG_RESULT(no)
     2014fi
     2015test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
     2016AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
     2017[# I'd rather use --version here, but apparently some GNU lds only accept -v.
     2018case `$LD -v 2>&1 </dev/null` in
     2019*GNU* | *'with BFD'*)
     2020  lt_cv_prog_gnu_ld=yes
     2021  ;;
     2022*)
     2023  lt_cv_prog_gnu_ld=no
     2024  ;;
     2025esac])
     2026with_gnu_ld=$lt_cv_prog_gnu_ld
     2027])# AC_PROG_LD_GNU
    19212028
    19222029dnl *-*wedit:notab*-*  Please keep this as the last line.
Note: See TracChangeset for help on using the changeset viewer.