[anjuta] build-basic-autotools: Do not propose to configure the project without a Makefile.am



commit 3e681aaee8512194d12da6c4c579d806279a81fe
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Tue Jun 14 23:02:41 2011 +0200

    build-basic-autotools: Do not propose to configure the project without a Makefile.am

 plugins/build-basic-autotools/plugin.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/plugins/build-basic-autotools/plugin.c b/plugins/build-basic-autotools/plugin.c
index db2fbc1..ab126c0 100644
--- a/plugins/build-basic-autotools/plugin.c
+++ b/plugins/build-basic-autotools/plugin.c
@@ -2203,23 +2203,25 @@ build_configure_and_build (BasicAutotoolsPlugin *plugin, BuildFunc func, GFile *
 {
 	GFile *build_dir;
 	gboolean has_makefile;
+	gboolean has_makefile_am;
 
 	/* Get build directory and check for makefiles */
 	build_dir = build_file_from_file (plugin, file, NULL);
 	has_makefile = directory_has_makefile (build_dir);
+	has_makefile_am = directory_has_makefile_am (plugin, build_dir);
 	g_object_unref (build_dir);
-
-	if (!has_makefile && (plugin->project_root_dir != NULL))
-	{
-		/* Run configure first */
-		build_configure_dialog (plugin, func, file);
-	}
-	else
+	
+	if (has_makefile)
 	{
 		/* Some build functions have less arguments but
 		 * it is not a problem in C */
 		func (plugin, file, NULL, NULL, NULL);
 	}
+	else if (has_makefile_am && (plugin->project_root_dir != NULL))
+	{
+		/* Run configure first */
+		build_configure_dialog (plugin, func, file);
+	}
 }
 
 /* Configuration commands



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]