[java-atk-wrapper] Revert "remove workaround for non root installs"

[Magdalen Berns <mberns src gnome org>]

commit 781f1d2dd9b4632ab3021e7e40e6817fc8ff5695
Author: Magdalen Berns <m berns thismagpie com>
Date:   Wed Dec 31 19:38:58 2014 +0000

    Revert "remove workaround for non root installs"
    
    This reverts commit 3e7ce3376c50e5e42f43900d72edb5bda84f09b5.

 configure.ac        |    2 ++
 wrapper/Makefile.am |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3afaf33..8d61de2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,6 +163,8 @@ AC_OUTPUT([
     wrapper/org/GNOME/Accessibility/Makefile
 ])
 
+AM_CONDITIONAL(USER, test `whoami` = "root")
+
 echo "
 Build configuration:
 
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 4f42f0b..31ed022 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -3,15 +3,21 @@ JARFILES=java-atk-wrapper.jar
 ALL_CLASSES=org/GNOME/Accessibility/*.class
 DEP_CLASSES=$(wildcard $(ALL_CLASSES))
 
+if USER
 java_atk_wrapperdir = $(JAVA_HOME)/lib/ext
+else
 java_atk_wrapperdir = $(prefix)/jre/lib/ext
+endif
 
 java_atk_wrapper_DATA = $(JARFILES)
 
 EXTRA_DIST = $(properties_DATA)
 
+if USER
 propertiesdir = $(JAVA_HOME)/lib
+else
 propertiesdir = $(prefix)/jre/lib
+endif
 
 properties_DATA = accessibility.properties