author | Michael Krelin <hacker@klever.net> | 2005-02-13 22:04:58 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-02-13 22:04:58 (UTC) |
commit | 5f46976a264df39b847e3095b5babb400ab2a3e7 (patch) (unidiff) | |
tree | 059b3a6031dd2f375339a27a4de25af1686b7124 | |
parent | 9aa669090e978dce5e1f4d1ca9d23a4d92208518 (diff) | |
download | sitecing-5f46976a264df39b847e3095b5babb400ab2a3e7.zip sitecing-5f46976a264df39b847e3095b5babb400ab2a3e7.tar.gz sitecing-5f46976a264df39b847e3095b5babb400ab2a3e7.tar.bz2 |
portability improvements
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | lib/sitecing_util.cc | 3 |
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 | |||
@@ -48,18 +48,20 @@ PKG_CHECK_MODULES([DOTCONF],[dotconf],,[ | |||
48 | AC_WITH_PCRE([ | 48 | AC_WITH_PCRE([ |
49 | AC_WITH_PCREPP(,[ | 49 | AC_WITH_PCREPP(,[ |
50 | AC_MSG_ERROR([no pcre++ library found]) | 50 | AC_MSG_ERROR([no pcre++ library found]) |
51 | ]) | 51 | ]) |
52 | ],[ | 52 | ],[ |
53 | AC_MSG_ERROR([no pcre library found]) | 53 | AC_MSG_ERROR([no pcre library found]) |
54 | ]) | 54 | ]) |
55 | 55 | ||
56 | AC_CHECK_LIB([dl],[dlopen],,[ | 56 | AC_CHECK_FUNC([dlopen],,[ |
57 | AC_MSG_ERROR([no dlopen library found]) | 57 | AC_CHECK_LIB([dl],[dlopen],,[ |
58 | AC_MSG_ERROR([no dlopen library found]) | ||
59 | ]) | ||
58 | ]) | 60 | ]) |
59 | 61 | ||
60 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 62 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
61 | 63 | ||
62 | WANT_DOXYGEN="yes" | 64 | WANT_DOXYGEN="yes" |
63 | AC_ARG_ENABLE([doxygen], | 65 | AC_ARG_ENABLE([doxygen], |
64 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), | 66 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), |
65 | [ | 67 | [ |
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 | |||
@@ -255,17 +255,18 @@ namespace sitecing { | |||
255 | } | 255 | } |
256 | } | 256 | } |
257 | rv += '/'; | 257 | rv += '/'; |
258 | rv += r; | 258 | rv += r; |
259 | return rv; | 259 | return rv; |
260 | } | 260 | } |
261 | 261 | ||
262 | void auto_chdir::pushdir(const string& td,bool ap) { | 262 | void auto_chdir::pushdir(const string& td,bool ap) { |
263 | char *tmp = get_current_dir_name(); | 263 | /* TODO: make use of fchdir(2) instead */ |
264 | char *tmp = getcwd(0,0); | ||
264 | assert(tmp); | 265 | assert(tmp); |
265 | saved_pwd = tmp; | 266 | saved_pwd = tmp; |
266 | free(tmp); | 267 | free(tmp); |
267 | autopop=ap; | 268 | autopop=ap; |
268 | if(chdir(td.c_str())) | 269 | if(chdir(td.c_str())) |
269 | throw konforka::exception(CODEPOINT,"failed to chdir()"); | 270 | throw konforka::exception(CODEPOINT,"failed to chdir()"); |
270 | } | 271 | } |
271 | void auto_chdir::popdir() { | 272 | void auto_chdir::popdir() { |