ncurses-config.patch 3.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081
  1. Use pkg-config to search for ncurses libraries
  2. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  3. Upstream-Status: Pending
  4. Index: iptraf-ng-1.1.4/Makefile
  5. ===================================================================
  6. --- iptraf-ng-1.1.4.orig/Makefile
  7. +++ iptraf-ng-1.1.4/Makefile
  8. @@ -205,8 +205,8 @@ endif
  9. ifndef NCURSES_LDFLAGS
  10. ifdef NEEDS_NCURSES5
  11. - NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null)
  12. - NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null)
  13. + NCURSES_CFLAGS := $(shell pkg-config ncurses --cflags 2>/dev/null)
  14. + NCURSES_LDFLAGS := $(shell pkg-config ncurses --libs 2>/dev/null)
  15. ifndef NO_PANEL
  16. NCURSES_LDFLAGS += -lpanel
  17. endif
  18. @@ -215,8 +215,8 @@ endif
  19. ifndef NCURSES_LDFLAGS
  20. ifdef NEEDS_NCURSESW5
  21. - NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null)
  22. - NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null)
  23. + NCURSES_CFLAGS := $(shell p[k-config ncursesw --cflags 2>/dev/null)
  24. + NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
  25. ifndef NO_PANEL
  26. NCURSES_LDFLAGS += -lpanel
  27. endif
  28. @@ -225,8 +225,8 @@ endif
  29. ifndef NCURSES_LDFLAGS
  30. ifdef NEEDS_NCURSES6
  31. - NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null)
  32. - NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null)
  33. + NCURSES_CFLAGS := $(shell pkg-config ncurses6 --cflags 2>/dev/null)
  34. + NCURSES_LDFLAGS := $(shell pkg-config ncurses6 --libs 2>/dev/null)
  35. ifndef NO_PANEL
  36. NCURSES_LDFLAGS += -lpanel
  37. endif
  38. @@ -235,8 +235,8 @@ endif
  39. ifndef NCURSES_LDFLAGS
  40. ifdef NEEDS_NCURSESW6
  41. - NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null)
  42. - NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null)
  43. + NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
  44. + NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
  45. ifndef NO_PANEL
  46. NCURSES_LDFLAGS += -lpanel
  47. endif
  48. @@ -246,17 +246,17 @@ endif
  49. # try find ncuses by autodetect
  50. ifndef NCURSES_LDFLAGS
  51. ifneq ($(shell ncursesw6-config --libs 2>/dev/null),)
  52. - NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null)
  53. - NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null)
  54. - else ifneq ($(shell ncurses6-config --libs 2>/dev/null),)
  55. - NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null)
  56. - NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null)
  57. - else ifneq ($(shell ncursesw5-config --libs 2>/dev/null),)
  58. - NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null)
  59. - NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null)
  60. - else ifneq ($(shell ncurses5-config --libs 2>/dev/null),)
  61. - NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null)
  62. - NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null)
  63. + NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
  64. + NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
  65. + else ifneq ($(shell pkg-config ncurses --libs 2>/dev/null),)
  66. + NCURSES_CFLAGS := $(shell pkg-config ncurses --cflags 2>/dev/null)
  67. + NCURSES_LDFLAGS := $(shell pkg-config ncurses --libs 2>/dev/null)
  68. + else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),)
  69. + NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
  70. + NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
  71. + else ifneq ($(shell pkg-config ncurses --libs 2>/dev/null),)
  72. + NCURSES_CFLAGS := $(shell pkg-config ncurses --cflags 2>/dev/null)
  73. + NCURSES_LDFLAGS := $(shell pkg-config ncurses --libs 2>/dev/null)
  74. endif
  75. ifneq ($(NCURSES_LDFLAGS),)