diff options
| author | Michele Campus <fci1908@gmail.com> | 2016-04-03 23:58:51 +0200 |
|---|---|---|
| committer | Michele Campus <fci1908@gmail.com> | 2016-04-03 23:58:51 +0200 |
| commit | 697617622cf11e7cc6a384efb81510aa146dfb50 (patch) | |
| tree | 6c2af96ade52cb43c1e940be10531a3ff4d71731 | |
| parent | aa86387ba949ba70c4791e9df68bcf47fdc4a286 (diff) | |
| parent | 6f95182751bcaee42260cfffe8ab891fc4406b95 (diff) | |
Merge pull request #169 from theirix/build-json-c
Improved autogen.sh, json-c search
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 26 |
2 files changed, 15 insertions, 13 deletions
diff --git a/autogen.sh b/autogen.sh index 6d4876e5f..492ef3bf6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -30,4 +30,4 @@ if test -z $AUTORECONF; then fi autoreconf -ivf -./configure +./configure $* diff --git a/configure.ac b/configure.ac index d2dfc4357..e65baea81 100644 --- a/configure.ac +++ b/configure.ac @@ -61,17 +61,20 @@ else fi fi -PKG_CONFIG=$(which pkg-config) - -if test -d /usr/local/include/json-c/; then : - CFLAGS="$CFLAGS -I/usr/local/include/json-c/" - LDFLAGS="$LDFLAGS -L/usr/local/lib -ljson-c" -else - if ! test -z "$PKG_CONFIG"; then : - CFLAGS="$CFLAGS $(pkg-config --cflags json-c)" - LDFLAGS="$LDFLAGS $(pkg-config --libs json-c)" - fi -fi +AC_ARG_ENABLE([json-c], + AS_HELP_STRING([--disable-json-c], [Disable json-c support])) + +AS_IF([test "x$enable_json_c" != "xno"], [ + PKG_CONFIG_PATH=/usr/local/share/pkgconfig:$PKG_CONFIG_PATH + pkg-config --exists json-c + AS_IF([test "$?" == "0"], + [ + CFLAGS="$CFLAGS $(pkg-config --cflags json-c)" + LDFLAGS="$LDFLAGS $(pkg-config --libs json-c)" + AC_CHECK_LIB(json-c, json_object_new_object, AC_DEFINE_UNQUOTED(HAVE_JSON_C, 1, [The JSON-C library is present])) + ], + []) + ]) OLD_LIBS=$LIBS LIBS="-L/opt/napatech3/lib $LIBS" @@ -81,7 +84,6 @@ AC_CHECK_LIB([ntapi], [], [] ) LIBS=$OLD_LIBS -AC_CHECK_LIB(json-c, json_object_new_object, AC_DEFINE_UNQUOTED(HAVE_JSON_C, 1, [The JSON-C library is present])) AC_CHECK_LIB(pthread, pthread_setaffinity_np, AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETAFFINITY_NP, 1, [libc has pthread_setaffinity_np])) |