Line 0
Link Here
|
|
|
1 |
--- configure.ac.orig 2019-10-10 09:33:43 UTC |
2 |
+++ configure.ac |
3 |
@@ -100,7 +100,7 @@ fi |
4 |
AC_MSG_CHECKING(--enable-fw-mgr argument) |
5 |
AC_ARG_ENABLE(fw-mgr, |
6 |
[ --enable-fw-mgr Enable compiling mstfwmanager tool and features], |
7 |
- [enable_fw_mgr="yes"], |
8 |
+ [enable_fw_mgr=$enableval], |
9 |
[enable_fw_mgr="no"]) |
10 |
AC_MSG_RESULT($enable_fw_mgr) |
11 |
if test "x$enable_fw_mgr" = "xyes"; then |
12 |
@@ -116,7 +116,7 @@ fi |
13 |
AC_MSG_CHECKING(--enable-adb-generic-tools argument) |
14 |
AC_ARG_ENABLE(adb-generic-tools, |
15 |
[ --enable-adb-generic-tools Enable compiling the following tools which depends on ADABE: mstreg and mstlink], |
16 |
- [enable_adb_generic_tools="yes"], |
17 |
+ [enable_adb_generic_tools=$enableval], |
18 |
[enable_adb_generic_tools="no"]) |
19 |
AC_MSG_RESULT($enable_adb_generic_tools) |
20 |
if test "x$enable_adb_generic_tools" = "xyes"; then |
21 |
@@ -143,7 +143,7 @@ AC_SUBST(ENABLE_FWMGR) |
22 |
AC_MSG_CHECKING(--enable-xml2 argument) |
23 |
AC_ARG_ENABLE(xml2, |
24 |
[ --enable-xml2 Enable mstflint libxml2 dependent features], |
25 |
- [enable_xml2="yes"], |
26 |
+ [enable_xml2=$enableval], |
27 |
[enable_xml2="no"]) |
28 |
AC_MSG_RESULT($enable_xml2) |
29 |
if test [ "x$enable_xml2" = "xyes" ] || [ test "x$enable_fw_mgr" = "xyes" ]; then |
30 |
@@ -185,7 +185,7 @@ AM_CONDITIONAL(ENABLE_INBAND, [test "x$enable_inband" |
31 |
AC_MSG_CHECKING(--enable-cs argument) |
32 |
AC_ARG_ENABLE(cs, |
33 |
[ --enable-cs Enable mstflint "checksum" command, dependant of openssl library], |
34 |
- [enable_cs="yes"], |
35 |
+ [enable_cs=$enableval], |
36 |
[enable_cs="no"]) |
37 |
AC_MSG_RESULT($enable_cs) |
38 |
if test "x$enable_cs" = "xyes"; then |
39 |
@@ -211,7 +211,7 @@ fi |
40 |
AC_MSG_CHECKING(--enable-all-static argument) |
41 |
AC_ARG_ENABLE([all_static], |
42 |
AS_HELP_STRING([--enable-all-static], [Enable creating none dynamic executables]), |
43 |
- [enable_all_static="yes"], |
44 |
+ [enable_all_static=$enableval], |
45 |
[enable_all_static="no"]) |
46 |
AC_MSG_RESULT($enable_all_static) |
47 |
|
48 |
@@ -237,7 +237,7 @@ AC_ARG_ENABLE([static_libstdcpp], |
49 |
AS_HELP_STRING([--enable-static-libstdcpp], [Enable link static to libstdc++])) |
50 |
|
51 |
AS_IF([test "x$enable_static_libstdcpp" = "xyes" -o "x$enable_all_static" = "xyes" ], [ |
52 |
- CXXFLAGS="$CXXFLAGS -static-libstdc++ -static-libgcc" |
53 |
+ CXXFLAGS="$CXXFLAGS -static" |
54 |
]) |
55 |
|
56 |
AC_ARG_ENABLE([dynamic_ld], |
57 |
@@ -267,7 +267,7 @@ AS_IF([test "x$INIPARSER_SYSTEM_AVAILABLE" = "xyes" ], |
58 |
CXXFLAGS="$CXXFLAGS -DHAVE_INI_PARSER" |
59 |
]) |
60 |
|
61 |
-AC_SEARCH_LIBS([json_object_get], [json-c jason], [JSON_SYSTEM_AVAILABLE="yes"],[ |
62 |
+AC_SEARCH_LIBS([json_object_get], [jsoncpp], [JSON_SYSTEM_AVAILABLE="yes"],[ |
63 |
JSON_SYSTEM_AVAILABLE="no" |
64 |
JSON_CFLAGS='-I$(top_srcdir)/ext_libs/json' |
65 |
AC_SUBST(JSON_CFLAGS) |