[OpenSRF-GIT] OpenSRF branch master updated. c0630d2bcedb086ac4e8bef98cc37748fc0cce3a

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  c0630d2bcedb086ac4e8bef98cc37748fc0cce3a (commit)
      from  d262e2892203dc74fcd1abc69a9ae7458566b18a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c0630d2bcedb086ac4e8bef98cc37748fc0cce3a
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Wed Oct 31 10:21:18 2012 -0400

    Change OSRF_JAVA_DEPSDIR so building Java just works.
    
    OSRF_JAVA_DEPSDIR was being set to /opt/java by configure without any
    documentation to that effect. The src/java/deps.sh downloads the deps files
    to src/java/deps. This means that you cannot just build java without either
    copying the jars from src/java/deps or altering src/java/Makefile.
    
    This edit changes the AC_SUBST call to replace OSRF_JAVA_DEPSDIR with deps,
    so that you can at least build java without making any changes.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/configure.ac b/configure.ac
index e6f5c74..3bca402 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,7 @@ AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
  
 # path to the directory containing the java dependency jar files (included if java installs)
 if test $OSRF_INSTALL_JAVA; then
-	AC_SUBST([OSRF_JAVA_DEPSDIR], [/opt/java])
+	AC_SUBST([OSRF_JAVA_DEPSDIR], [deps])
     AC_CONFIG_FILES([src/java/Makefile])
 fi
 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
OpenSRF