< prev index next >

make/autoconf/help.m4

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Oracle designates this

@@ -23,22 +23,20 @@
 # questions.
 #
 
 AC_DEFUN_ONCE([HELP_SETUP_DEPENDENCY_HELP],
 [
-  AC_CHECK_PROGS(PKGHANDLER, zypper apt-get yum brew port pkgutil pkgadd)
+  AC_CHECK_PROGS(PKGHANDLER, apt-get yum brew port pkgutil pkgadd)
 ])
 
 AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY],
 [
   # Print a helpful message on how to acquire the necessary build dependency.
   # $1 is the help tag: cups, alsa etc
   MISSING_DEPENDENCY=$1
 
-  if test "x$MISSING_DEPENDENCY" = "xopenjdk"; then
-    HELP_MSG="OpenJDK distributions are available at http://jdk.java.net/."
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
     cygwin_help $MISSING_DEPENDENCY
   elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
     msys_help $MISSING_DEPENDENCY
   else
     PKGHANDLER_COMMAND=

@@ -54,12 +52,10 @@
         port_help    $MISSING_DEPENDENCY ;;
       pkgutil)
         pkgutil_help $MISSING_DEPENDENCY ;;
       pkgadd)
         pkgadd_help  $MISSING_DEPENDENCY ;;
-      zypper)
-        zypper_help  $MISSING_DEPENDENCY ;;
     esac
 
     if test "x$PKGHANDLER_COMMAND" != x; then
       HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
     fi

@@ -91,10 +87,12 @@
   case $1 in
     reduced)
       PKGHANDLER_COMMAND="sudo apt-get install gcc-multilib g++-multilib" ;;
     devkit)
       PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
+    openjdk)
+      PKGHANDLER_COMMAND="sudo apt-get install openjdk-8-jdk" ;;
     alsa)
       PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
     cups)
       PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
     fontconfig)

@@ -110,33 +108,16 @@
     dtrace)
       PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;;
   esac
 }
 
-zypper_help() {
-  case $1 in
-    devkit)
-      PKGHANDLER_COMMAND="sudo zypper install gcc gcc-c++" ;;
-    alsa)
-      PKGHANDLER_COMMAND="sudo zypper install alsa-devel" ;;
-    cups)
-      PKGHANDLER_COMMAND="sudo zypper install cups-devel" ;;
-    fontconfig)
-      PKGHANDLER_COMMAND="sudo zypper install fontconfig-devel" ;;
-    freetype)
-      PKGHANDLER_COMMAND="sudo zypper install freetype-devel" ;;
-    x11)
-      PKGHANDLER_COMMAND="sudo zypper install libX11-devel libXext-devel libXrender-devel libXrandr-devel libXtst-devel libXt-devel libXi-devel" ;;
-    ccache)
-      PKGHANDLER_COMMAND="sudo zypper install ccache" ;;
-  esac
-}
-
 yum_help() {
   case $1 in
     devkit)
       PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
+    openjdk)
+      PKGHANDLER_COMMAND="sudo yum install java-1.8.0-openjdk-devel" ;;
     alsa)
       PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
     cups)
       PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
     fontconfig)

@@ -150,10 +131,12 @@
   esac
 }
 
 brew_help() {
   case $1 in
+    openjdk)
+      PKGHANDLER_COMMAND="brew cask install java" ;;
     freetype)
       PKGHANDLER_COMMAND="brew install freetype" ;;
     ccache)
       PKGHANDLER_COMMAND="brew install ccache" ;;
   esac
< prev index next >