2 files changed, 6 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 0da7658..b9e9b56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,10 +52,12 @@ AC_WITH_PCRE([
 ],[
  AC_MSG_ERROR([no pcre library found])
 ])
 
-AC_CHECK_LIB([dl],[dlopen],,[
- AC_MSG_ERROR([no dlopen library found])
+AC_CHECK_FUNC([dlopen],,[
+ AC_CHECK_LIB([dl],[dlopen],,[
+  AC_MSG_ERROR([no dlopen library found])
+ ])
 ])
 
 AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
 
diff --git a/lib/sitecing_util.cc b/lib/sitecing_util.cc
index 9b6c54e..5466b28 100644
--- a/lib/sitecing_util.cc
+++ b/lib/sitecing_util.cc
@@ -259,9 +259,10 @@ namespace sitecing {
         return rv;
     }
 
     void auto_chdir::pushdir(const string& td,bool ap) {
-        char *tmp = get_current_dir_name();
+        /* TODO: make use of fchdir(2) instead */
+        char *tmp = getcwd(0,0);
         assert(tmp);
         saved_pwd = tmp;
         free(tmp);
         autopop=ap;