Johannes: modif of cmake configuration to be able to compile on Ubuntu 14.04

modif of cmake configuration to be able to compile on Ubuntu 14.04

maca_export/CMakeLists.txt

 
 if(MACA_EXPORT)
-  FIND_PACKAGE(SWIG 3.0)
+  FIND_PACKAGE(SWIG)
   if (SWIG_FOUND)
     FIND_PACKAGE(PythonLibs)
 
@@ -37,7 +37,7 @@ if(MACA_EXPORT)
 
     FIND_PACKAGE(Java 1.7)
     FIND_PACKAGE(JNI)
-    if (JNI_FOUND AND Java_FOUND)
+    if (JNI_FOUND AND (Java_FOUND OR JAVA_FOUND))
       set(JAVA_MODULE_NAME Macaon)
       set(JAVA_LIBRARY MacaonJava)
       set(JAVA_CLASS_TAGGER MacaonTransTagger)