SF.net SVN: geany-plugins:[867] trunk/geany-plugins

[dmaphy at users.sourceforge.net]

Revision: 867
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=867&view=rev
Author:   dmaphy
Date:     2009-07-25 19:51:02 +0000 (Sat, 25 Jul 2009)

Log Message:
-----------
use elf_abi.h instead of elf.h when compiling geanygdb on openbsd

Modified Paths:
--------------
    trunk/geany-plugins/geanygdb/src/gdb-ui-main.c
    trunk/geany-plugins/wscript

Modified: trunk/geany-plugins/geanygdb/src/gdb-ui-main.c
===================================================================
--- trunk/geany-plugins/geanygdb/src/gdb-ui-main.c	2009-07-23 20:59:57 UTC (rev 866)
+++ trunk/geany-plugins/geanygdb/src/gdb-ui-main.c	2009-07-25 19:51:02 UTC (rev 867)
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <elf.h>
 #include <gtk/gtk.h>
 
 #include "gdb-io.h"
@@ -17,6 +16,13 @@
 
 #include "support.h"
 
+#ifdef HAVE_ELF_H
+# include <elf.h>
+#elif defined(HAVE_ELF_ABI_H)
+# include <elf_abi.h>
+#else
+# error Missing Elf header
+#endif
 
 
 GdbUiSetup gdbui_setup;

Modified: trunk/geany-plugins/wscript
===================================================================
--- trunk/geany-plugins/wscript	2009-07-23 20:59:57 UTC (rev 866)
+++ trunk/geany-plugins/wscript	2009-07-25 19:51:02 UTC (rev 867)
@@ -67,9 +67,7 @@
 	Plugin('codenav', None, [ 'codenav/src' ]),
 	Plugin('geanylatex', None, [ 'geanylatex/src']),
 	Plugin('geanylipsum', None, [ 'geanylipsum/src']),
-	Plugin('geanysendmail',
-		[ 'geanysendmail/src/geanysendmail.c' ],
-		[ 'geanysendmail/src' ]),
+	Plugin('geanysendmail', None, [ 'geanysendmail/src' ]),
 	Plugin('geanyvc', None, [ 'geanyvc/src/'], [ [ 'gtkspell-2.0', '2.0', False ] ]),
 	Plugin('shiftcolumn', None, [ 'shiftcolumn/src']),
 	Plugin('spellcheck', None, [ 'spellcheck/src' ], [ [ 'enchant', '1.3', True ] ]),
@@ -80,7 +78,7 @@
 		   'gdb-ui-frame.c',  'gdb-ui-locn.c', 'gdb-ui-main.c',
 		   'geanydebug.c']), # source files
 		 [ 'geanygdb', 'geanygdb/src' ], # include dirs
-		 [ [ 'elf.h', '', True ] ]
+		 [ [ 'elf.h', '', False ], [ 'elf_abi.h', '', False ] ]
 		 ),
 	Plugin('geanylua',
 		 [ 'geanylua/geanylua.c' ], # the other source files are listed in build_lua()
@@ -250,7 +248,10 @@
 							enabled_plugins.remove(p.name)
 
 	if 'geanygdb' in enabled_plugins:
-		conf.define('TTYHELPERDIR', conf.env['LIBEXECDIR'] + '/geany-plugins/geanygdb', 1)
+		if not conf.env['HAVE_ELF_H'] and not conf.env['HAVE_ELF_ABI_H']:
+			enabled_plugins.remove('geanygdb')
+		else:
+			conf.define('TTYHELPERDIR', conf.env['LIBEXECDIR'] + '/geany-plugins/geanygdb', 1)
 
 	# Windows specials
 	if is_win32:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.