Merge commit 'origin/master' into obsd

Conflicts:
	configure.ac
	xinit.c
	xinitrc.cpp

1 files changed, 12 insertions, 4 deletions

diff --git a/xinitrc.cpp b/xinitrc.cpp
index 6c10073..737bfab 100644
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
@@ -17,12 +17,20 @@ if [ -f $sysmodmap ]; then
     XMODMAP $sysmodmap
 fi
 
-if [ -f $userresources ]; then
-    XRDB -merge $userresources
+if [ -f "$userresources" ]; then
+#ifdef __APPLE__
+    if [ -x /usr/bin/cpp ] ; then
+        XRDB -merge "$userresources"
+    else
+        XRDB -nocpp -merge "$userresources"
+    fi
+#else
+    XRDB -merge "$userresources"
+#endif
 fi
 
-if [ -f $usermodmap ]; then
-    XMODMAP $usermodmap
+if [ -f "$usermodmap" ]; then
+    XMODMAP "$usermodmap"
 fi
 
 XCOMM if we have private ssh key(s), start ssh-agent and add the key(s)