1.1 --- a/common/autoconf/help.m4 Mon Oct 21 11:59:25 2013 +0200
1.2 +++ b/common/autoconf/help.m4 Tue Oct 22 11:12:43 2013 +0200
1.3 @@ -33,41 +33,74 @@
1.4 # Print a helpful message on how to acquire the necessary build dependency.
1.5 # $1 is the help tag: freetyp2, cups, pulse, alsa etc
1.6 MISSING_DEPENDENCY=$1
1.7 - PKGHANDLER_COMMAND=
1.8
1.9 - case $PKGHANDLER in
1.10 - apt-get)
1.11 - apt_help $MISSING_DEPENDENCY ;;
1.12 - yum)
1.13 - yum_help $MISSING_DEPENDENCY ;;
1.14 - port)
1.15 - port_help $MISSING_DEPENDENCY ;;
1.16 - pkgutil)
1.17 - pkgutil_help $MISSING_DEPENDENCY ;;
1.18 - pkgadd)
1.19 - pkgadd_help $MISSING_DEPENDENCY ;;
1.20 - * )
1.21 - break ;;
1.22 - esac
1.23 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.24 + cygwin_help $MISSING_DEPENDENCY
1.25 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.26 + msys_help $MISSING_DEPENDENCY
1.27 + else
1.28 + PKGHANDLER_COMMAND=
1.29
1.30 - if test "x$PKGHANDLER_COMMAND" != x; then
1.31 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.32 + case $PKGHANDLER in
1.33 + apt-get)
1.34 + apt_help $MISSING_DEPENDENCY ;;
1.35 + yum)
1.36 + yum_help $MISSING_DEPENDENCY ;;
1.37 + port)
1.38 + port_help $MISSING_DEPENDENCY ;;
1.39 + pkgutil)
1.40 + pkgutil_help $MISSING_DEPENDENCY ;;
1.41 + pkgadd)
1.42 + pkgadd_help $MISSING_DEPENDENCY ;;
1.43 + * )
1.44 + break ;;
1.45 + esac
1.46 +
1.47 + if test "x$PKGHANDLER_COMMAND" != x; then
1.48 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.49 + fi
1.50 fi
1.51 ])
1.52
1.53 cygwin_help() {
1.54 case $1 in
1.55 unzip)
1.56 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
1.57 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip )"
1.58 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.59 + ;;
1.60 zip)
1.61 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
1.62 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P zip )"
1.63 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.64 + ;;
1.65 make)
1.66 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
1.67 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )"
1.68 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.69 + ;;
1.70 + freetype2)
1.71 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.72 + HELP_MSG="To install freetype, run:
1.73 +wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe
1.74 +chmod +x /tmp/freetype-setup.exe
1.75 +/tmp/freetype-setup.exe
1.76 +Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\".
1.77 +After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll."
1.78 + else
1.79 + HELP_MSG="You need to build a 64-bit version of freetype.
1.80 +This is not readily available.
1.81 +You can find source code and build instructions on
1.82 +http://www.freetype.org/
1.83 +If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically."
1.84 + fi
1.85 + ;;
1.86 * )
1.87 break ;;
1.88 esac
1.89 }
1.90
1.91 +msys_help() {
1.92 + PKGHANDLER_COMMAND=""
1.93 +}
1.94 +
1.95 apt_help() {
1.96 case $1 in
1.97 devkit)
