2011-04-13 05:54:41 +00:00
|
|
|
Rebase the patch to fit 1.0.24.2
|
2010-06-26 08:29:38 +00:00
|
|
|
|
2011-04-13 05:54:41 +00:00
|
|
|
Upstream-Status: Inappropriate [configuration]
|
|
|
|
|
|
|
|
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
|
|
|
|
|
|
|
|
diff -ruN alsa-utils-1.0.24.2-orig//configure.in alsa-utils-1.0.24.2/configure.in
|
|
|
|
--- alsa-utils-1.0.24.2-orig//configure.in 2011-04-13 13:51:20.337665010 +0800
|
|
|
|
+++ alsa-utils-1.0.24.2/configure.in 2011-04-13 13:51:54.437664986 +0800
|
|
|
|
@@ -127,34 +127,16 @@
|
2010-06-26 08:29:38 +00:00
|
|
|
NCURSESLIBSUFFIX=""
|
|
|
|
CURSES_NLS="no"
|
|
|
|
if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then
|
2009-05-23 22:50:09 +00:00
|
|
|
- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes])
|
|
|
|
- if test "$ncursesw5_config" = "yes"; then
|
|
|
|
- CURSESINC="<ncurses.h>"
|
|
|
|
- CURSESLIB=`ncursesw5-config --libs`
|
2010-06-26 08:29:38 +00:00
|
|
|
- CURSESLIBDIR=`ncursesw5-config --libdir`
|
2009-05-23 22:50:09 +00:00
|
|
|
- CURSES_CFLAGS=`ncursesw5-config --cflags`
|
|
|
|
- curseslib="ncursesw"
|
|
|
|
- else
|
2011-04-13 05:54:41 +00:00
|
|
|
AC_CHECK_LIB(ncursesw, initscr,
|
2009-05-23 22:50:09 +00:00
|
|
|
[ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"])
|
|
|
|
- fi
|
2010-06-26 08:29:38 +00:00
|
|
|
if test -n "$CURSESINC"; then
|
|
|
|
NCURSESLIBSUFFIX="w"
|
|
|
|
CURSES_NLS="yes"
|
|
|
|
fi
|
2009-05-23 22:50:09 +00:00
|
|
|
fi
|
|
|
|
if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then
|
|
|
|
- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes])
|
|
|
|
- if test "$ncurses5_config" = "yes"; then
|
|
|
|
- CURSESINC="<ncurses.h>"
|
|
|
|
- CURSESLIB=`ncurses5-config --libs`
|
2010-06-26 08:29:38 +00:00
|
|
|
- CURSESLIBDIR=`ncurses5-config --libdir`
|
2009-05-23 22:50:09 +00:00
|
|
|
- CURSES_CFLAGS=`ncurses5-config --cflags`
|
|
|
|
- curseslib="ncurses"
|
|
|
|
- else
|
2011-04-13 05:54:41 +00:00
|
|
|
AC_CHECK_LIB(ncurses, initscr,
|
2009-05-23 22:50:09 +00:00
|
|
|
[ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; curseslib="ncurses"])
|
|
|
|
- fi
|
|
|
|
fi
|
|
|
|
if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then
|
2011-04-13 05:54:41 +00:00
|
|
|
AC_CHECK_LIB(curses, initscr,
|