Attempt 2 at fixing libreadline

git-svn-id: http://sanoi.webfactional.com/trunk@110 79def182-f41f-0410-b320-e94a04284523
mario · Oct 8, 2007 · 0f99d69 · 0f99d69
1 parent 1640c64
commit 0f99d69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/wscript b/src/wscript
@@ -4,5 +4,5 @@ def build(bld):
     obj = bld.create_obj('cc', 'program')
     obj.find_sources_in_dirs(".")
     obj.target = 'fama'
-    obj.uselib = 'GLIB GOBJECT LIBTAPIOCA-CLIENT-GLIB NCURSESW PANEL LIBREADLINE' 
+    obj.uselib = 'GLIB GOBJECT LIBTAPIOCA-CLIENT-GLIB NCURSESW PANEL READLINE' 
 
diff --git a/wscript b/wscript
@@ -15,16 +15,19 @@ def configure(conf):
     conf.check_pkg('glib-2.0', destvar='GLIB', vnum='2.10.0')
     conf.check_pkg('libtapioca-client-glib-0.14', destvar='LIBTAPIOCA-CLIENT-GLIB', vnum='0.14.0.2') 
     conf.check_pkg('gobject-2.0', destvar='GOBJECT', vnum='2.10.0')
-    conf.check_pkg('libreadline5', destvar='LIBREADLINE')
     conf.check_header('ncursesw/panel.h')
     conf.check_header('ncursesw/ncurses.h')
-
+    conf.check_header('readline/history.h')
+
     conf.env['LIB_NCURSESW'] = "ncursesw"
     conf.env['LIBPATH_NCURSESW'] = '/usr/include'
 
     conf.env['LIB_PANEL'] = "panelw"
     conf.env['LIBPATH_PANEL'] = '/usr/include'
 
+    conf.env['LIB_READLINE'] = "readline"
+    conf.env['LIBPATH_READLINE'] = '/usr/include'
+
     conf.add_define('VERSION', VERSION)
     conf.add_define('MAJORMINOR', '.'.join(VERSION.split('.')[0:2]))