openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File one.patch of Package kscope (Revision 0bbd0672c87d835d724945d2fc6e14ff)

Currently displaying revision 0bbd0672c87d835d724945d2fc6e14ff , Show latest

diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index d85b119..87f2463 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -5766,8 +5766,11 @@ if test "x$kde_java_bindir" != "xno"; then
     if test ! -x "$kde_java_bindir/javac"; then
       AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.])
     fi
-    if test ! -x "$kde_java_bindir/javah"; then
-      AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
+    kde_javac_h=`$kde_java_bindir/javac -h 2>&1 | grep "invalid flag"`
+    if test -n "$kde_javac_h"; then
+      if test ! -x "$kde_java_bindir/javah"; then
+        AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
+      fi
     fi
     if test ! -x "$kde_java_bindir/jar"; then
       AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
@@ -5875,7 +5878,23 @@ else
   AC_MSG_RESULT([none found])
 fi
 
+AC_MSG_CHECKING([if Java is >= 8])
+JAVA8=false
+if test -x "$kde_java_bindir/javac"; then
+  kde_javac_h=`$kde_java_bindir/javac -h 2>&1 | grep "invalid flag"`
+  if test -z "$kde_javac_h"; then
+    JAVA8=true
+    JAVAH=
+  fi
+fi
+if $JAVA8; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+
 AC_SUBST(JAVAC)
+AC_SUBST(JAVA8)
 AC_SUBST(JAVAH)
 AC_SUBST(JAR)
 AC_SUBST(JVMLIBS)
@@ -6493,63 +6512,72 @@ if test "x$enable_cppunit" = "xyes"; then
               [  --enable-online-tests   Include online tests with CPPUNIT tests],,
               enable_online_tests=no)
   AC_MSG_RESULT($enable_online_tests)
+  cppunit_version_min=$1
 
-  if test x$cppunit_config_exec_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
+  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists cppunit; then
+     PKG_CHECK_MODULES(CPPUNIT, [cppunit >= $cppunit_version_min],,
+        [
+        AC_MSG_WARN(Minimum version of CPPUNIT couldn't be found. Tests will not be built)
+        no_cppunit=yes
+        ])
+  else
+     if test x$cppunit_config_exec_prefix != x ; then
+        cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
+        if test x${CPPUNIT_CONFIG+set} != xset ; then
+           CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
+        fi
      fi
-  fi
-  if test x$cppunit_config_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
+     if test x$cppunit_config_prefix != x ; then
+        cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
+        if test x${CPPUNIT_CONFIG+set} != xset ; then
+           CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
+        fi
      fi
-  fi
 
-  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
-  cppunit_version_min=$1
+     AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
+
+     AC_MSG_CHECKING(for CPPUNIT - version >= $cppunit_version_min)
+     no_cppunit=""
+     if test "$CPPUNIT_CONFIG" = "no" ; then
+       AC_MSG_RESULT(no)
+       AC_MSG_WARN(Unable to locate cppunit-config. Tests will not be built)
+       no_cppunit=yes
+     else
+       CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
+       CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+       cppunit_version=`$CPPUNIT_CONFIG --version`
+
+       cppunit_major_version=`echo $cppunit_version | \
+              sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'`
+       cppunit_minor_version=`echo $cppunit_version | \
+              sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'`
+       cppunit_micro_version=`echo $cppunit_version | \
+              sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'`
+
+       cppunit_major_min=`echo $cppunit_version_min | \
+              sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'`
+       cppunit_minor_min=`echo $cppunit_version_min | \
+              sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'`
+       cppunit_micro_min=`echo $cppunit_version_min | \
+              sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'`
+
+       cppunit_version_proper=`expr \
+           $cppunit_major_version \> $cppunit_major_min \| \
+           $cppunit_major_version \= $cppunit_major_min \& \
+           $cppunit_minor_version \> $cppunit_minor_min \| \
+           $cppunit_major_version \= $cppunit_major_min \& \
+           $cppunit_minor_version \= $cppunit_minor_min \& \
+           $cppunit_micro_version \>= $cppunit_micro_min `
+
+       if test "$cppunit_version_proper" = "1" ; then
+         AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
+       else
+         AC_MSG_RESULT(no)
+         AC_MSG_WARN(Minimum version of CPPUNIT couldn't be found. Tests will not be built)
+         no_cppunit=yes
+       fi
+     fi
 
-  AC_MSG_CHECKING(for CPPUNIT - version >= $cppunit_version_min)
-  no_cppunit=""
-  if test "$CPPUNIT_CONFIG" = "no" ; then
-    AC_MSG_RESULT(no)
-    AC_MSG_WARN(Unable to locate cppunit-config. Tests will not be built)
-    no_cppunit=yes
-  else
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-    cppunit_version=`$CPPUNIT_CONFIG --version`
-
-    cppunit_major_version=`echo $cppunit_version | \
-           sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'`
-    cppunit_minor_version=`echo $cppunit_version | \
-           sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'`
-    cppunit_micro_version=`echo $cppunit_version | \
-           sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'`
-
-    cppunit_major_min=`echo $cppunit_version_min | \
-           sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'`
-    cppunit_minor_min=`echo $cppunit_version_min | \
-           sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'`
-    cppunit_micro_min=`echo $cppunit_version_min | \
-           sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'`
-
-    cppunit_version_proper=`expr \
-        $cppunit_major_version \> $cppunit_major_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \> $cppunit_minor_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \= $cppunit_minor_min \& \
-        $cppunit_micro_version \>= $cppunit_micro_min `
-
-    if test "$cppunit_version_proper" = "1" ; then
-      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
-    else
-      AC_MSG_RESULT(no)
-      AC_MSG_WARN(Minimum version of CPPUNIT couldn't be found. Tests will not be built)
-      no_cppunit=yes
-    fi
   fi
 else
   no_cppunit=user
diff --git a/admin/cvs.sh b/admin/cvs.sh
index 9b0e3c5..0f8ce8d 100644
--- a/admin/cvs.sh
+++ b/admin/cvs.sh
@@ -56,7 +56,7 @@ esac
 AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
 required_automake_version="1.6.1 or newer"
 case $AUTOMAKE_STRING in
-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13* | automake*1.14* | automake*1.15* )
+  automake*1.6.* | automake*1.[7-9]* | automake*1.[1-9][0-9]* )
     echo "*** $AUTOMAKE_STRING found."
     UNSERMAKE=no
     ;;

Places

File one.patch of Package kscope (Revision 0bbd0672c87d835d724945d2fc6e14ff)

Places