Changeset 171 for trunk/configure.ac

Timestamp:

Jul 8, 2008, 11:16:14 AM (16 years ago)

Author:

katerina

Message:

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

File:

• trunk/configure.ac (modified) (13 diffs)

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.4.4) 
+AM_INIT_AUTOMAKE(samhain, 2.4.5)
+AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
 
@@ -30 +31 @@
 AC_PROG_LN_S
 AC_PROG_AWK
+SH_PROG_LD
 AC_PATH_PROG(cmd_hostname,hostname)
 AC_SUBST(cmd_hostname)
@@ -37 +39 @@
    GCC_STACK_PROTECT_LIB
    GCC_STACK_PROTECT_CC
+   GCC_PIE_CC
 fi
 
@@ -54 +57 @@
 mynetbsd=no
 sh_use_lcaps="undef"
+dnmalloc_ok=yes
 
 case "$host_os" in
@@ -102 +106 @@
         AC_DEFINE([HOST_IS_OPENBSD], 1, [Define if host OS is OPENBSD])
         selectconfig=freebsd
-        AC_MSG_RESULT(none)
+        dnmalloc_ok=no
+        AC_MSG_RESULT(OpenBSD dnmalloc does not work with pthreads)
         ;;
 
@@ -165 +170 @@
         
         *hpux*)
-        AC_MSG_RESULT(HPUX has not always h_errno defined)
+        AC_MSG_RESULT(HPUX need _XOPEN_SOURCE_EXTENDED for h_errno)
         AC_DEFINE(HOST_IS_HPUX)
         if test "x$GCC" != "xyes"; then
@@ -204 +209 @@
 AC_DECL_SYS_SIGLIST 
 
-AC_CHECK_HEADERS(stddef.h libgen.h sched.h \
+AC_CHECK_HEADERS(stddef.h libgen.h sched.h malloc.h sys/uio.h \
+        sys/mman.h sys/param.h \
         sys/vfs.h mntent.h \
         sys/select.h sys/socket.h netinet/in.h \
@@ -275 +281 @@
         inet_aton gethostbyname setutent setrlimit gethostname uname \
         initgroups getpagesize \
-        ttyname fchmod \
+        ttyname fchmod writev mmap \
         getsid getpriority getpgid statvfs \
-        strerror_r \
-        getgrgid_r getpwnam_r getpwuid_r gmtime_r localtime_r rand_r readdir_r strtok_r
+        strerror_r getgrgid_r getpwnam_r getpwuid_r \
+        gmtime_r localtime_r rand_r readdir_r strtok_r
 )
 AC_CHECK_FUNC(statfs, AC_DEFINE(HAVE_STATFS) statfs="yes",  statfs="no")
@@ -827 +833 @@
 AC_SUBST(clmytclient)
 
+sh_no_gcc_static=no
+
 AC_ARG_ENABLE(static,
         [  --enable-static              enable static linking [[no]]],
@@ -838 +846 @@
                 AC_DEFINE(SH_COMPILE_STATIC, 1, [Define if compiling static])
                 if test "x$GCC" = "xyes"; then
+                        sh_no_gcc_static=no
                         LDFLAGS="$LDFLAGS -static"
                 else
+                   sh_no_gcc_static=yes
                    case "$host_os" in
 
@@ -887 +897 @@
         ]
 )
+
+if test x$enable_static = xyes; then
+   :
+else
+   LDFLAGS="$LDFLAGS $PIE_LDFLAGS"
+   CFLAGS="$CFLAGS $PIE_CFLAGS"
+fi
 
 if test x"${mytclient}" = x-DSH_STANDALONE -o x"${mytclient}" = x-DSH_WITH_CLIENT;
@@ -1386 +1403 @@
                 AC_DEFINE(WITH_TPT)
                 AC_DEFINE(SL_DEBUG)
+                AC_DEFINE(DNMALLOC_CHECKS, 1, [Debug dnmalloc])
+                AC_DEFINE(PARANOIA, 0, [Paranoia level for dnmalloc])
                 AC_DEFINE(SL_FAIL_ON_ERROR)
                 if test "x${myneedg3}" = "xyes"; then
@@ -1397 +1416 @@
 )
 AC_SUBST(mydebugdef)
+
+if test "x${dnmalloc_ok}" = "xyes"; then
+   sh_dnmalloc_enabled=yes
+else
+   sh_dnmalloc_enabled=no
+fi
+
+AC_ARG_ENABLE(dnmalloc,
+        [  --disable-dnmalloc                   disable dnmalloc],
+        [
+        if test "x${enable_dnmalloc}" = xno; then
+                sh_dnmalloc_enabled=no
+        else
+                sh_dnmalloc_enabled=yes 
+        fi
+        ]
+)
+
+dnl Handle the problem that static linking against libc.a on Linux
+dnl produces the error "multiple definitions of malloc"
+dnl
+if test "x$sh_dnmalloc_enabled" = "xyes"; then
+   if test x$enable_static = xyes; then
+      if test "x$sh_no_gcc_static" = "xyes"; then
+         sh_dnmalloc_enabled=no
+      else
+         if test "x$with_gnu_ld" = "xyes"; then
+           LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition"
+         else
+           sh_dnmalloc_enabled=no
+         fi
+      fi
+   fi
+fi
+
+if test "x${sh_dnmalloc_enabled}" = xno; then
+   AC_DEFINE(USE_SYSTEM_MALLOC,1,[Define if you want to use the system malloc])
+fi
 
 AC_ARG_ENABLE(ptrace,