patch-configure 2.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798
  1. --- kismet-2010-01-R1.orig/configure Fri Jan 8 00:33:30 2010
  2. +++ kismet-2010-01-R1/configure Wed Feb 17 21:59:01 2010
  3. @@ -26,9 +26,10 @@ esac
  4. fi
  5. +oCC="$CC"
  6. +CC="$CXX"
  7. -
  8. # PATH needs CR
  9. # Avoid depending upon Character Ranges.
  10. as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  11. @@ -6836,74 +6837,7 @@ else
  12. $as_echo "yes" >&6; }
  13. fi
  14. -# Do we use libstdc++?
  15. -# We need to swap to the g++ compiler here
  16. -oCC="$CC"
  17. -CC="$CXX"
  18. -{ $as_echo "$as_me:$LINENO: checking for main in -luClibc++" >&5
  19. -$as_echo_n "checking for main in -luClibc++... " >&6; }
  20. -if test "${ac_cv_lib_uClibcpp_main+set}" = set; then
  21. - $as_echo_n "(cached) " >&6
  22. -else
  23. - ac_check_lib_save_LIBS=$LIBS
  24. -LIBS="-luClibc++ $LIBS"
  25. -cat >conftest.$ac_ext <<_ACEOF
  26. -/* confdefs.h. */
  27. -_ACEOF
  28. -cat confdefs.h >>conftest.$ac_ext
  29. -cat >>conftest.$ac_ext <<_ACEOF
  30. -/* end confdefs.h. */
  31. -
  32. -int
  33. -main ()
  34. -{
  35. -return main ();
  36. - ;
  37. - return 0;
  38. -}
  39. -_ACEOF
  40. -rm -f conftest.$ac_objext conftest$ac_exeext
  41. -if { (ac_try="$ac_link"
  42. -case "(($ac_try" in
  43. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  44. - *) ac_try_echo=$ac_try;;
  45. -esac
  46. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  47. -$as_echo "$ac_try_echo") >&5
  48. - (eval "$ac_link") 2>conftest.er1
  49. - ac_status=$?
  50. - grep -v '^ *+' conftest.er1 >conftest.err
  51. - rm -f conftest.er1
  52. - cat conftest.err >&5
  53. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  54. - (exit $ac_status); } && {
  55. - test -z "$ac_c_werror_flag" ||
  56. - test ! -s conftest.err
  57. - } && test -s conftest$ac_exeext && {
  58. - test "$cross_compiling" = yes ||
  59. - $as_test_x conftest$ac_exeext
  60. - }; then
  61. - ac_cv_lib_uClibcpp_main=yes
  62. -else
  63. - $as_echo "$as_me: failed program was:" >&5
  64. -sed 's/^/| /' conftest.$ac_ext >&5
  65. -
  66. - ac_cv_lib_uClibcpp_main=no
  67. -fi
  68. -
  69. -rm -rf conftest.dSYM
  70. -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  71. - conftest$ac_exeext conftest.$ac_ext
  72. -LIBS=$ac_check_lib_save_LIBS
  73. -fi
  74. -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_uClibcpp_main" >&5
  75. -$as_echo "$ac_cv_lib_uClibcpp_main" >&6; }
  76. -if test "x$ac_cv_lib_uClibcpp_main" = x""yes; then
  77. - foundcxxl="uclibc" CXXLIBS="$CXXLIBS -luClibc++"
  78. -fi
  79. -
  80. -
  81. # Do we use uclibc++?
  82. if test "$foundcxxl"x == "x"; then
  83. { $as_echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
  84. @@ -7017,7 +6951,7 @@ fi
  85. # Add additional cflags since some distros bury panel.h
  86. -CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
  87. +#CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
  88. termcontrol="none";