You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2015/12/07 13:12:46 UTC

svn commit: r1718322 - /subversion/branches/ra-git/build/ac-macros/libgit2.m4

Author: philip
Date: Mon Dec  7 12:12:45 2015
New Revision: 1718322

URL: http://svn.apache.org/viewvc?rev=1718322&view=rev
Log:
* build/ac-macros/libgit2.m4 (SVN_LIB_GIT2): Allow libgit2 to be optional.

Modified:
    subversion/branches/ra-git/build/ac-macros/libgit2.m4

Modified: subversion/branches/ra-git/build/ac-macros/libgit2.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/build/ac-macros/libgit2.m4?rev=1718322&r1=1718321&r2=1718322&view=diff
==============================================================================
--- subversion/branches/ra-git/build/ac-macros/libgit2.m4 (original)
+++ subversion/branches/ra-git/build/ac-macros/libgit2.m4 Mon Dec  7 12:12:45 2015
@@ -53,17 +53,16 @@ AC_DEFUN(SVN_LIB_GIT2,
   ],
   [ ])
 
-  if test "$libgit2_found" = "no"; then
-    AC_MSG_ERROR([subversion requires libgit2])
-  fi
-
   if test "$libgit2_found" = "yes"; then
     SVN_LIBGIT2_INCLUDES="-I$libgit2_prefix/include"
     LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$libgit2_prefix/lib)`"
-  fi
 
-  SVN_LIBGIT2_LIBS="-lgit2"
+    SVN_LIBGIT2_LIBS="-lgit2"
 
-  AC_SUBST(SVN_LIBGIT2_INCLUDES)
-  AC_SUBST(SVN_LIBGIT2_LIBS)
+    AC_SUBST(SVN_LIBGIT2_INCLUDES)
+    AC_SUBST(SVN_LIBGIT2_LIBS)
+    svn_lib_git=yes
+  else
+    svn_lib_git=no
+  fi
 ])