1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
diff --git a/configure.ac b/configure.ac
index 8c1559c..94175c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,32 +79,44 @@ dnl ===========================================================================
dnl Check for libgit2 ssh support
dnl ===========================================================================
-AC_MSG_CHECKING([for libgit2 ssh support])
-
-cflags_save="${CFLAGS}"
-libs_save="${LIBS}"
-
-CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
-LIBS="${LIBGIT2_GLIB_LIBS}"
-
-AC_TRY_RUN([
- #include <git2.h>
- int
- main(int argc, const char *argv[])
- {
- git_threads_init ();
- return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
- }
-],[
- AC_MSG_RESULT([yes])
- git_ssh=yes
-],[
- AC_MSG_RESULT([no])
- git_ssh=no
-])
-
-CFLAGS="${cflags_save}"
-LIBS="${libs_save}"
+AC_ARG_ENABLE([ssh],
+ AS_HELP_STRING([--enable-ssh[=@<:@no/auto/yes@:>@]],[Build with libgit2 ssh support]),
+ [enable_ssh=$enableval],
+ [enable_ssh="auto"])
+
+git_ssh=no
+
+if test "x$enable_ssh" != "xno"; then
+ AC_MSG_CHECKING([for libgit2 ssh support])
+
+ cflags_save="${CFLAGS}"
+ libs_save="${LIBS}"
+
+ CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
+ LIBS="${LIBGIT2_GLIB_LIBS}"
+
+ AC_TRY_RUN([
+ #include <git2.h>
+ int
+ main(int argc, const char *argv[])
+ {
+ git_threads_init ();
+ return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
+ }
+ ],[
+ AC_MSG_RESULT([yes])
+ git_ssh=yes
+ ],[
+ AC_MSG_RESULT([no])
+ git_ssh=no
+ if test "x$enable_ssh" = "xyes"; then
+ AC_MSG_ERROR([libgit2 ssh support was requiested, but not found])
+ fi
+ ])
+
+ CFLAGS="${cflags_save}"
+ LIBS="${libs_save}"
+fi
if test "x$git_ssh" = "xyes"; then
LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1"
|
GitWeb
