mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

78 lines
2.9 KiB

  1. --- ./acinclude.m4.orig 2007-05-16 17:45:55.000000000 +0200
  2. +++ ./acinclude.m4 2007-05-16 17:46:02.000000000 +0200
  3. @@ -39,7 +39,7 @@
  4. dnl
  5. AC_DEFUN([AC_PROMPT_USER],
  6. [
  7. -MSG_CHECK=`echo "$2" | tail -1`
  8. +MSG_CHECK=`echo "$2" | tail -n1`
  9. AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1,
  10. [echo "" >&AC_FD_MSG
  11. AC_PROMPT_USER_NO_DEFINE($1,[$2],$3)
  12. --- ./configure.orig 2007-05-16 17:46:11.000000000 +0200
  13. +++ ./configure 2007-05-16 17:46:27.000000000 +0200
  14. @@ -47130,7 +47130,7 @@
  15. ME=`$WHOAMI`
  16. if test -f /etc/resolv.conf; then
  17. - LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
  18. + LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n1 | awk '{print $NF}'`
  19. else
  20. LOC="@no.where"
  21. fi
  22. @@ -47156,7 +47156,7 @@
  23. Providing the --with-default-snmp-version=\"x\" parameter to ./configure
  24. will avoid this prompt.
  25. -Default version of SNMP to use" | tail -1`
  26. +Default version of SNMP to use" | tail -n1`
  27. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  28. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  29. if test "${ac_cv_user_prompt_NETSNMP_DEFAULT_SNMP_VERSION+set}" = set; then
  30. @@ -47237,7 +47237,7 @@
  31. Providing the --with-sys-contact=\"contact\" parameter to ./configure
  32. will avoid this prompt.
  33. -System Contact Information" | tail -1`
  34. +System Contact Information" | tail -n1`
  35. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  36. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  37. if test "${ac_cv_user_prompt_NETSNMP_SYS_CONTACT+set}" = set; then
  38. @@ -47301,7 +47301,7 @@
  39. Providing the --with-sys-location=\"location\" parameter to ./configure
  40. will avoid this prompt.
  41. -System Location" | tail -1`
  42. +System Location" | tail -n1`
  43. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  44. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  45. if test "${ac_cv_user_prompt_NETSNMP_SYS_LOC+set}" = set; then
  46. @@ -47371,7 +47371,7 @@
  47. Providing the --with-logfile=\"path\" parameter to ./configure
  48. will avoid this prompt.
  49. -Location to write logfile" | tail -1`
  50. +Location to write logfile" | tail -n1`
  51. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  52. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  53. if test "${ac_cv_user_prompt_NETSNMP_LOGFILE+set}" = set; then
  54. @@ -47448,7 +47448,7 @@
  55. Providing the --with-persistent-directory=\"path\" parameter to
  56. ./configure will avoid this prompt.
  57. -Location to write persistent information" | tail -1`
  58. +Location to write persistent information" | tail -n1`
  59. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  60. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  61. if test "${ac_cv_user_prompt_NETSNMP_PERSISTENT_DIRECTORY+set}" = set; then
  62. --- ./configure.in.orig 2007-05-16 17:46:33.000000000 +0200
  63. +++ ./configure.in 2007-05-16 17:46:39.000000000 +0200
  64. @@ -4487,7 +4487,7 @@
  65. ME=`$WHOAMI`
  66. if test -f /etc/resolv.conf; then
  67. - LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
  68. + LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n1 | awk '{print $NF}'`
  69. else
  70. LOC="@no.where"
  71. fi