middle of porting; unstable, don't checkout, src compiles; refs #1

configure.in

@@ -95,13 +95,6 @@ PKG_PROG_PKG_CONFIG
 # solaris?
 AC_CHECK_HEADER(sys/old_procfs.h, [AM_CPPFLAGS=-D__solaris__])
 
-# libraries
-AC_CHECK_HEADER(log4cxx/logger.h, [have_log4cxx=yes])
-AC_CHECK_HEADER(ltdl.h, [have_ltdl=yes])
-AC_CHECK_HEADER(regex.h, [have_regex=yes])
-AC_CHECK_HEADERS(unistd.h fcntl.h, [have_exec=yes])
-AC_CHECK_HEADER(dirent.h, [have_dir=yes])
-
 # Arguments
 AM_MAINTAINER_MODE
 AC_ARG_ENABLE(valgrind,
@@ -159,6 +152,15 @@ AC_ARG_ENABLE(stacktrace,
   [have_stacktrace="$enableval"], [have_stacktrace="yes"])
 AM_CONDITIONAL(HAVE_STACKTRACE, test "$have_stacktrace" = "yes")
 if test "$have_stacktrace" = "yes"; then
+  # Hack for bug:
+  #   /usr/include/libiberty.h:106:36:
+  #     error: new declaration 'char* basename(const char*)'
+  #   /usr/include/string.h:603:28: error:
+  #     ambiguates old declaration 'const char* basename(const char*)'
+  # bug {
+  old_ac_includes_default=$ac_includes_default
+  ac_includes_default=""
+  # } bug
   AC_CHECK_HEADER([demangle.h],
                   [AC_DEFINE([HAVE_DEMANGLE_H])],
                   [AC_MSG_WARN([Header "demangle.h" from the binutils not found!
@@ -167,7 +169,7 @@ if test "$have_stacktrace" = "yes"; then
  - the required symbols are now declared in stacktrace.cxx according to my
    own binutils version (binutils-2.16.1) it may or may not be compatible to
    yours])])
-  AC_SEARCH_LIBS(cplus_demangle, [demangle iberty],
+  AC_SEARCH_LIBS(cplus_demangle, [demangle iberty_pic iberty],
                  [AC_MSG_RESULT([OK, found cplus_demangle])],
 [AC_MSG_ERROR([Function cplus_demangle not found!
  - I looked in libdemangle and libiberty
@@ -187,6 +189,9 @@ It is required for stach trace!
  - or configure with option --enable-ltdl
  - or configure with option --disable-stacktrace])])
   fi
+  # bug {
+  ac_includes_default=$old_ac_includes_default
+  # } bug
 fi
 AC_ARG_WITH([boost-thread],AS_HELP_STRING([--with-boost-thread],
             [specify the boost thread library or suffix to use]),
@@ -225,6 +230,13 @@ test "$enableval" = "yes" && HAVE_DOXYGEN="YES" || HAVE_DOXYGEN="NO";
 AM_CONDITIONAL(HAVE_DOXYGEN, test "$enableval" = "yes")
 AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
 
+# libraries
+AC_CHECK_HEADER(log4cxx/logger.h, [have_log4cxx=yes])
+AC_CHECK_HEADER(ltdl.h, [have_ltdl=yes])
+AC_CHECK_HEADER(regex.h, [have_regex=yes])
+AC_CHECK_HEADERS(unistd.h fcntl.h, [have_exec=yes])
+AC_CHECK_HEADER(dirent.h, [have_dir=yes])
+
 MINGW32=no
 MAC=no
 case $host_os in