allow building without gui to work * configure.ac: Enable building GUI by default. Rename OCTAVE_GUI to AMCOND_BUILD_GUI. Don't define or substitute GUIDIR. Don't check for GUI toolkit tools and libraries if building GUI is disabled. * Makefile.am: Use else clause for AMCOND_BUILD_GUI automake conditional. * src/Makefile.am: If not building GUI, make octave and octave-cli binaries identical. * gui/src/Makefile.am: Style fixes. Use - instead of _ and .cc instead of .cpp in generated file names.

--- a/gui/src/settings-dialog.cc
+++ b/gui/src/settings-dialog.cc
@@ -17,7 +17,7 @@
 
 #include "resource-manager.h"
 #include "settings-dialog.h"
-#include "ui_settings-dialog.h"
+#include "ui-settings-dialog.h"
 #include <QSettings>
 
 settings_dialog::settings_dialog (QWidget * parent):