diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 09:24:19 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 12:01:26 -0500 |
| commit | 240934659cd8326a14324c73d4f0f88eecfddcab (patch) | |
| tree | e07cde48aa0a143bebf10ca7103cc0e69febad25 /src/nmcli/nmcli.c | |
| parent | fbe61ddadf4a89800a8e3651ae91099259ddf2ad (diff) | |
| parent | 1628eda029ba4dede8d4d45572c6b60367882436 (diff) | |
Merge tag 'debian/1.34.0-2' into ubuntu/master
network-manager Debian release 1.34.0-2
Diffstat (limited to 'src/nmcli/nmcli.c')
| -rw-r--r-- | src/nmcli/nmcli.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nmcli/nmcli.c b/src/nmcli/nmcli.c index e592e054..b2b2cd81 100644 --- a/src/nmcli/nmcli.c +++ b/src/nmcli/nmcli.c @@ -14,9 +14,12 @@ #include <termios.h> #include <unistd.h> #include <locale.h> -#include <glib-unix.h> +#if HAVE_EDITLINE_READLINE +#include <editline/readline.h> +#else #include <readline/readline.h> #include <readline/history.h> +#endif #include "libnmc-base/nm-client-utils.h" @@ -28,9 +31,9 @@ #include "settings.h" #if defined(NM_DIST_VERSION) - #define NMCLI_VERSION NM_DIST_VERSION +#define NMCLI_VERSION NM_DIST_VERSION #else - #define NMCLI_VERSION VERSION +#define NMCLI_VERSION VERSION #endif #define _NMC_COLOR_PALETTE_INIT() \ |