Changeset 2263Tweet

Timestamp:

Jan 22, 2013, 10:32:51 PM (10 years ago)

Author:

sam

Message:

build: check for getcwd() and _getcwd() and configure time.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/sys/init.cpp (modified) (1 diff)

trunk/configure.ac

@@ -80 +80 @@
 AC_CHECK_HEADERS(security/pam_appl.h security/pam_misc.h)
 AC_CHECK_HEADERS(pam/pam_appl.h pam/pam_misc.h)
+
+AC_CHECK_FUNCS(getcwd _getcwd)
 
 if test "${enable_debug}" = "yes"; then

trunk/src/sys/init.cpp

@@ -39 +39 @@
           String const projectdir, String const solutiondir)
 {
+    using namespace std;
+
     /*
      * Retrieve binary directory, defaulting to current dir.
      */
 
-#if defined _WIN32
+#if defined HAVE_GETCWD
+    char *cwd = getcwd(NULL, 0);
+#elif defined HAVE__GETCWD || (defined _WIN32 && !defined _XBOX)
     char *cwd = _getcwd(NULL, 0);
 #else
-    char *cwd = getcwd(NULL, 0);
+    char *cwd = NULL;
 #endif
     String binarydir = String(cwd ? cwd : ".") + SEPARATOR;