diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2010-07-08 22:27:23 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2010-07-09 06:37:42 +0800 |
| commit | 62bd07ab4997bb1959c1095fcce91f97c2878a8d (patch) | |
| tree | 7f98a0daee552364740b91ac6d72c1b40c9d9bcf | |
| parent | 00c7156baa528fff2ee491c8d3452d3e2effb627 (diff) | |
| download | gsoc2013-empathy-62bd07ab4997bb1959c1095fcce91f97c2878a8d.tar gsoc2013-empathy-62bd07ab4997bb1959c1095fcce91f97c2878a8d.tar.gz gsoc2013-empathy-62bd07ab4997bb1959c1095fcce91f97c2878a8d.tar.bz2 gsoc2013-empathy-62bd07ab4997bb1959c1095fcce91f97c2878a8d.tar.lz gsoc2013-empathy-62bd07ab4997bb1959c1095fcce91f97c2878a8d.tar.xz gsoc2013-empathy-62bd07ab4997bb1959c1095fcce91f97c2878a8d.tar.zst gsoc2013-empathy-62bd07ab4997bb1959c1095fcce91f97c2878a8d.zip | |
Cleanup nm/conman pkg check
No need to check for libnm_glib twice
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index e00441024..2bba2774e 100644 --- a/configure.ac +++ b/configure.ac @@ -235,6 +235,7 @@ if test "x$with_connectivity" = "xno"; then have_connman=no elif test "x$with_connectivity" = "xconnman"; then + have_nm=no PKG_CHECK_MODULES(CONNMAN, [ @@ -243,10 +244,10 @@ elif test "x$with_connectivity" = "xconnman"; then if test "x$have_connman" = "xyes"; then AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies]) - have_nm=no fi else + have_connman=no PKG_CHECK_MODULES(NETWORK_MANAGER, [ @@ -255,17 +256,6 @@ else if test "x$have_nm" = "xyes"; then AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib]) - have_connman=no - else - PKG_CHECK_MODULES(NETWORK_MANAGER, - [ - libnm-glib >= $NETWORK_MANAGER_REQUIRED - ], have_nm="yes", have_nm="no") - - if test "x$have_nm" = "xyes"; then - AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib]) - have_connman=no - fi fi fi |