From 23f3dae076a39144cacf2d21970eb1f539424f1b Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Sat, 6 Mar 2010 16:46:08 +0000
Subject: [PATCH] fix compilation on mac os x

based on a patch by Leif Middelschulte


SVN revision: 46911
---
 legacy/elementary/configure.ac       | 6 ++++++
 legacy/elementary/src/lib/elm_main.c | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac
index 96df07c074..f94b1fd6d6 100644
--- a/legacy/elementary/configure.ac
+++ b/legacy/elementary/configure.ac
@@ -94,6 +94,12 @@ dnl managed by evil
       have_socket="yes"
       AC_CHECK_LIB([socket], [connect], [], [have_socket="no"])
       ;;
+   darwin*)
+      ELM_UNIX_DEF="#define"
+      have_socket="yes"
+      AC_CHECK_HEADERS([crt_externs.h])
+      AC_DEFINE([environ], [(*_NSGetEnviron())], [apple doesn't follow POSIX in this case.])
+      ;;
    *)
       ELM_UNIX_DEF="#define"
       AC_CHECK_FUNCS(dlopen, res=yes, res=no)
diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c
index 657c14bc75..28b2e83450 100644
--- a/legacy/elementary/src/lib/elm_main.c
+++ b/legacy/elementary/src/lib/elm_main.c
@@ -1,11 +1,15 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif
 
 #include <dlfcn.h>      /* dlopen,dlclose,etc */
 
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
+#ifdef HAVE_CRT_EXTERNS_H
+# include <crt_externs.h>
 #endif
 
 #ifdef HAVE_EVIL