NEW - bug 361461: Autotools plug-in doesn't handle autogen.sh that does

no configuration 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=361461

	*
src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
(regenerateMakefiles): Fix autogen.sh
	case whereby autogen.sh doesn't run or create configure script.

2 files changed, 33 insertions, 9 deletions

diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/ChangeLog b/autotools/org.eclipse.linuxtools.cdt.autotools.core/ChangeLog
index d35dec09db..fc1b740637 100644
--- a/autotools/org.eclipse.linuxtools.cdt.autotools.core/ChangeLog
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Bug #361461
+	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java (regenerateMakefiles): Fix autogen.sh
+	case whereby autogen.sh doesn't run or create configure script.
+
 2011-10-03  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* src/org/eclipse/linuxtools/internal/cdt/autotools/core/configure/FlagConfigureOption.java (getParameter): Remote
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
index c05ca75f4d..497b2cca4f 100644
--- a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
@@ -517,15 +517,33 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
 					// autogen.sh ran configure and we should not run it
 					// ourselves.
 					if (configStatus == null || !configStatus.exists()) {
-						rc = runScript(configurePath, 
-								buildLocation,
-								configArgs, 
-								AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[]{buildDir}), //$NON-NLS-1$
-								errMsg, console, configureEnvs, false);
-						if (rc != IStatus.ERROR) {
-							File makefileFile = buildLocation.append(MAKEFILE).toFile();
-							addMakeTargetsToManager(makefileFile);
-							toolsCfg.setDirty(false);
+						if (!configurePath.toFile().exists()) {
+							// no configure script either...try running autoreconf
+							String[] reconfArgs = new String[1];
+							String reconfCmd = project.getPersistentProperty(AutotoolsPropertyConstants.AUTORECONF_TOOL);
+							if (reconfCmd == null)
+								reconfCmd = DEFAULT_AUTORECONF;
+							IPath reconfCmdPath = new Path(reconfCmd);
+							reconfArgs[0] = "-i"; //$NON-NLS-1$
+							rc = runScript(reconfCmdPath,
+									project.getLocation().append(srcDir),
+									reconfArgs,
+									AutotoolsPlugin.getFormattedString("MakeGenerator.autoreconf", new String[]{buildDir}), //$NON-NLS-1$
+									errMsg, console, null, consoleStart);
+							consoleStart = false;
+						}
+						// Check if configure generated and if yes, run it.
+						if (rc != IStatus.ERROR && configurePath.toFile().exists()) {
+							rc = runScript(configurePath, 
+									buildLocation,
+									configArgs, 
+									AutotoolsPlugin.getFormattedString("MakeGenerator.gen.makefile", new String[]{buildDir}), //$NON-NLS-1$
+									errMsg, console, configureEnvs, false);
+							if (rc != IStatus.ERROR) {
+								File makefileFile = buildLocation.append(MAKEFILE).toFile();
+								addMakeTargetsToManager(makefileFile);
+								toolsCfg.setDirty(false);
+							}
 						}
 					} else {
 						File makefileFile = buildLocation.append(MAKEFILE).toFile();