Merge pull request #3895 from psidhu/fix-ncurses6-gpsd-3.16
utils/gpsd: refresh 0002-ncurses6_detection to 3.16
This commit is contained in:
commit
225e877982
1 changed files with 7 additions and 5 deletions
|
@ -1,9 +1,11 @@
|
|||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -541,6 +541,10 @@ else:
|
||||
if env['ncurses']:
|
||||
if config.CheckPKG('ncurses'):
|
||||
Index: gpsd-3.16/SConstruct
|
||||
===================================================================
|
||||
--- gpsd-3.16.orig/SConstruct
|
||||
+++ gpsd-3.16/SConstruct
|
||||
@@ -543,6 +543,10 @@ else:
|
||||
ncurseslibs = pkg_config('ncurses')
|
||||
if config.CheckPKG('tinfo'):
|
||||
ncurseslibs += pkg_config('tinfo')
|
||||
+ elif WhereIs('ncurses6-config'):
|
||||
+ ncurseslibs = ['!ncurses6-config --libs --cflags']
|
||||
+ elif WhereIs('ncursesw6-config'):
|
||||
|
|
Loading…
Reference in a new issue