libbluray | branch: master | Diego Elio Pettenò <[email protected]> | Thu Feb 14 17:49:00 2013 -0800| [63df02668528b8d78ee4904698b8ddd29d0e2dd9] | committer: Diego Elio Pettenò
build: fix JDK_HOME variable handling. Declare the variable precious (so that it's saved) and document it, instead of adding a --with-jdk and then use the variable. > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=63df02668528b8d78ee4904698b8ddd29d0e2dd9 --- configure.ac | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 1f6fb53..6662991 100644 --- a/configure.ac +++ b/configure.ac @@ -51,17 +51,8 @@ libxml2_missing="Could not find libxml2 - disclib meta parser disabled." pkg_config_missing="Could not find pkg-config. Assuming..." dnl configure options - -AC_ARG_WITH([jdk], - AS_HELP_STRING([--with-jdk=DIR], - [Specify the path to the JDK (default is "/usr/lib/jvm/java-6-openjdk")]), - [JDK_HOME=$withval], - [ - # Set JDK_HOME unless already set in environment - if [[ -z "$JDK_HOME" ]]; then - JDK_HOME="/usr/lib/jvm/java-6-openjdk" - fi - ]) +AC_ARG_VAR([JDK_HOME], [Path to the JDK @<:@default=/usr/lib/jvm/java-6-openjdk@:>@]) +AS_IF([test -z "$JDK_HOME"], [JDK_HOME="/usr/lib/jvm/java-6-openjdk"]) AC_ARG_ENABLE([werror], [AS_HELP_STRING([--enable-werror], [set warnings as errors via -Werror @<:@default=disabled@:>@])]) _______________________________________________ libbluray-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libbluray-devel
