comparison: configure.ac
configure.ac
- changeset 30498
- 079df2f23d52
- parent 30491
- 343ac123ff38
- child 30499
- 19e9d4a69086
equal
deleted
inserted
replaced
| 30497:5404160a5f9d | 30498:079df2f23d52 |
|---|---|
| 660 dnl # Some distros put the headers in ncursesw/, some don't | 660 dnl # Some distros put the headers in ncursesw/, some don't |
| 661 found_ncurses_h=no | 661 found_ncurses_h=no |
| 662 for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include | 662 for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include |
| 663 do | 663 do |
| 664 f="$location/ncurses.h" | 664 f="$location/ncurses.h" |
| 665 orig_CFLAGS="$CFLAGS" | |
| 666 orig_CPPFLAGS="$CPPFLAGS" | |
| 667 CFLAGS="$CFLAGS -I$location" | |
| 668 CPPFLAGS="$CPPFLAGS -I$location" | |
| 665 AC_CHECK_HEADER($f,[ | 669 AC_CHECK_HEADER($f,[ |
| 666 AC_MSG_CHECKING([if $f supports wide characters]) | 670 AC_MSG_CHECKING([if $f supports wide characters]) |
| 667 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | 671 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
| 668 #define _XOPEN_SOURCE_EXTENDED | 672 #define _XOPEN_SOURCE_EXTENDED |
| 669 #include <$f> | 673 #include <$f> |
| 678 else | 682 else |
| 679 GNT_CFLAGS="" | 683 GNT_CFLAGS="" |
| 680 fi | 684 fi |
| 681 | 685 |
| 682 found_ncurses_h=yes | 686 found_ncurses_h=yes |
| 687 CFLAGS="$orig_CFLAGS" | |
| 688 CPPFLAGS="$orig_CPPFLAGS" | |
| 683 AC_MSG_RESULT([yes]) | 689 AC_MSG_RESULT([yes]) |
| 684 break | 690 break |
| 685 ], [ | 691 ], [ |
| 692 CFLAGS="$orig_CFLAGS" | |
| 693 CPPFLAGS="$orig_CPPFLAGS" | |
| 686 AC_MSG_RESULT([no]) | 694 AC_MSG_RESULT([no]) |
| 687 ]) | 695 ]) |
| 688 ]) | 696 ]) |
| 689 done | 697 done |
| 690 | 698 |
| 1356 dnl # Check for D-Bus libraries | 1364 dnl # Check for D-Bus libraries |
| 1357 dnl ####################################################################### | 1365 dnl ####################################################################### |
| 1358 | 1366 |
| 1359 AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--disable-dbus], [disable D-Bus support])], , enable_dbus=yes) | 1367 AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--disable-dbus], [disable D-Bus support])], , enable_dbus=yes) |
| 1360 AC_ARG_ENABLE(nm, [AC_HELP_STRING([--disable-nm], [disable NetworkManager support (requires D-Bus)])], enable_nm=$enableval, enable_nm=yes) | 1368 AC_ARG_ENABLE(nm, [AC_HELP_STRING([--disable-nm], [disable NetworkManager support (requires D-Bus)])], enable_nm=$enableval, enable_nm=yes) |
| 1369 enable_nm=no | |
| 1361 | 1370 |
| 1362 if test "x$enable_dbus" = "xyes" ; then | 1371 if test "x$enable_dbus" = "xyes" ; then |
| 1363 AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no) | 1372 AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no) |
| 1364 fi | 1373 fi |
| 1365 | 1374 |
