diff options
| author | Karel Zak <kzak@redhat.com> | 2010-07-01 10:56:41 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2010-07-01 10:56:41 +0200 |
| commit | 541e6934e1fe6833b125c1c64f9a1108bc3d09fa (patch) | |
| tree | b1c19c675fdfd32a00debafeaee38a403b7574ef /fdisk | |
| parent | 965b4900b9d0a0d716273558e52e188820108709 (diff) | |
| download | util-linux-old-541e6934e1fe6833b125c1c64f9a1108bc3d09fa.tar.gz | |
cfdisk: fix --with-slang
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisk')
| -rw-r--r-- | fdisk/Makefile.am | 2 | ||||
| -rw-r--r-- | fdisk/cfdisk.c | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am index 9a9db0c2..36871f3c 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -54,7 +54,7 @@ endif if USE_SLANG sbin_PROGRAMS += cfdisk dist_man_MANS += cfdisk.8 -cfdisk_SOURCES = cfdisk.c $(fdisk_common) $(top_srcdir)/lib/mbsalign.c +cfdisk_SOURCES = cfdisk.c $(fdisk_common) cfdisk_CFLAGS = $(cflags_blkid) cfdisk_LDADD = -lslang $(ldadd_blkid) else diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c index 30550c0a..552858b6 100644 --- a/fdisk/cfdisk.c +++ b/fdisk/cfdisk.c @@ -64,6 +64,13 @@ #include <errno.h> #include <getopt.h> #include <fcntl.h> + +#ifdef HAVE_SLANG_H +#include <slang.h> +#elif defined(HAVE_SLANG_SLANG_H) +#include <slang/slang.h> +#endif + #ifdef HAVE_SLCURSES_H #include <slcurses.h> #elif defined(HAVE_SLANG_SLCURSES_H) @@ -73,6 +80,7 @@ #elif defined(HAVE_NCURSES_NCURSES_H) #include <ncurses/ncurses.h> #endif + #include <signal.h> #include <math.h> #include <string.h> @@ -431,7 +439,8 @@ get_string(char *str, int len, char *def) { refresh(); -#if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) +#if !defined(HAVE_SLCURSES_H) && !defined(HAVE_SLANG_SLCURSES_H) && \ + defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) while ((key = get_wch(&c)) != ERR && c != '\r' && c != '\n' && c != KEY_ENTER) { #else |