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
|
--- configure.ac.old 2009-11-16 22:05:28.000000000 +0100
+++ configure.ac 2009-11-16 23:46:49.000000000 +0100
@@ -415,29 +415,38 @@
PKG_CHECK_MODULES([BLUEFISH_REQUIRED], [$BF_dependencies])
-# optionally build the charmap plugin if gucharmap is available
-PKG_CHECK_MODULES(
- [CHARMAP_PLUGIN],
- [gucharmap-2],
- [
- build_charmap_plugin=yes
- AC_DEFINE([HAVE_LIBGUCHARMAP_2], [1], [Define to 1 if you have the `gucharmap-2' library (-lgucharmap).])
- ],
- [PKG_CHECK_MODULES(
+# build the charmap plugin
+
+AC_ARG_ENABLE(
+ [charmap],
+ AC_HELP_STRING(
+ [--enable-charmap],
+ [enable (or disable) the charmap plugin needs gucharmap @<:@default=no@:>@]
+ )
+)
+
+if test "x$enable_charmap" != "xno"; then
+ PKG_CHECK_MODULES(
[CHARMAP_PLUGIN],
- [gucharmap >= 2.20],
+ [gucharmap-2],
[
build_charmap_plugin=yes
- AC_DEFINE([HAVE_LIBGUCHARMAP], [1], [Define to 1 if you have the `gucharmap' library (-lgucharmap).])
+ AC_DEFINE([HAVE_LIBGUCHARMAP_2], [1], [Define to 1 if you have the `gucharmap-2' library (-lgucharmap).])
],
- [
- build_charmap_plugin=no
- AC_MSG_WARN([Disabling the building of the charmap plugin.])
- AC_MSG_WARN([Install gucharmap/gucharmap2 (>= 2.20) library/headers to build the plugin.])
- ]
- )]
-)
-AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xyes"])
+ [PKG_CHECK_MODULES(
+ [CHARMAP_PLUGIN],
+ [gucharmap >= 2.20],
+ [
+ build_charmap_plugin=yes
+ AC_DEFINE([HAVE_LIBGUCHARMAP], [1], [Define to 1 if you have the `gucharmap' library (-lgucharmap).])
+ ],
+ )]
+ )
+ AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xyes"])
+else
+ AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xno"])
+ AC_MSG_NOTICE([Disable building charmap plugin.])
+fi
AC_SEARCH_LIBS([nanosleep], [posix4 rt])
|
GitWeb
