patch-configure 2.3 KB

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