diff --git a/autogen.sh b/autogen.sh
index ba54bb85f..5ff5ce022 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -46,10 +46,26 @@ fi
 
 echo "running aclocal..."
 aclocal -I /usr/share/aclocal
+if [ $? -ne 0 ]; then
+    echo "ERROR: 'aclocal -I /usr/share/aclocal' failed!"
+    exit 1
+fi
 echo "running autoconf..."
 autoconf
+if [ $? -ne 0 ]; then
+    echo "ERROR: 'autoconf' failed!"
+    exit 1
+fi
 echo "running autoheader..."
 autoheader
+if [ $? -ne 0 ]; then
+    echo "ERROR: 'autoheader' failed!"
+    exit 1
+fi
 echo "running automake..."
 automake -a
+if [ $? -ne 0 ]; then
+    echo "ERROR: 'automake -a' failed!"
+    exit 1
+fi
 echo "autogen.sh ok, now run ./configure script"
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 8e869046a..4be99cc54 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -15,6 +15,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+
+noinst_LIBRARIES = lib_weechat_gui_common.a
+
+lib_weechat_gui_common_a_SOURCES = gui-common.c \
+                                   gui.h
+
 if GUI_NCURSES
 curses_dir=curses
 endif
@@ -27,4 +34,4 @@ if GUI_QT
 qt_dir=qt
 endif
 
-SUBDIRS = $(curses_dir) $(gtk_dir) $(qt_dir)
+SUBDIRS = . $(curses_dir) $(gtk_dir) $(qt_dir)
diff --git a/src/gui/curses/Makefile.am b/src/gui/curses/Makefile.am
index 771ece40d..2f885de8f 100644
--- a/src/gui/curses/Makefile.am
+++ b/src/gui/curses/Makefile.am
@@ -19,12 +19,11 @@ INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
 
 bin_PROGRAMS = weechat-curses
 
-weechat_curses_LDADD = ../../common/lib_weechat_main.a \
+weechat_curses_LDADD = ../lib_weechat_gui_common.a \
+                       ../../common/lib_weechat_main.a \
                        ../../irc/lib_weechat_irc.a \
                        $(NCURSES_LIBS) \
                        ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
 
-weechat_curses_SOURCES = ../gui.h \
-                         ../gui-common.c \
-                         gui-display.c \
+weechat_curses_SOURCES = gui-display.c \
 			             gui-input.c
diff --git a/weechat/autogen.sh b/weechat/autogen.sh
index ba54bb85f..5ff5ce022 100755
--- a/weechat/autogen.sh
+++ b/weechat/autogen.sh
@@ -46,10 +46,26 @@ fi
 
 echo "running aclocal..."
 aclocal -I /usr/share/aclocal
+if [ $? -ne 0 ]; then
+    echo "ERROR: 'aclocal -I /usr/share/aclocal' failed!"
+    exit 1
+fi
 echo "running autoconf..."
 autoconf
+if [ $? -ne 0 ]; then
+    echo "ERROR: 'autoconf' failed!"
+    exit 1
+fi
 echo "running autoheader..."
 autoheader
+if [ $? -ne 0 ]; then
+    echo "ERROR: 'autoheader' failed!"
+    exit 1
+fi
 echo "running automake..."
 automake -a
+if [ $? -ne 0 ]; then
+    echo "ERROR: 'automake -a' failed!"
+    exit 1
+fi
 echo "autogen.sh ok, now run ./configure script"
diff --git a/weechat/src/gui/Makefile.am b/weechat/src/gui/Makefile.am
index 8e869046a..4be99cc54 100644
--- a/weechat/src/gui/Makefile.am
+++ b/weechat/src/gui/Makefile.am
@@ -15,6 +15,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
+
+noinst_LIBRARIES = lib_weechat_gui_common.a
+
+lib_weechat_gui_common_a_SOURCES = gui-common.c \
+                                   gui.h
+
 if GUI_NCURSES
 curses_dir=curses
 endif
@@ -27,4 +34,4 @@ if GUI_QT
 qt_dir=qt
 endif
 
-SUBDIRS = $(curses_dir) $(gtk_dir) $(qt_dir)
+SUBDIRS = . $(curses_dir) $(gtk_dir) $(qt_dir)
diff --git a/weechat/src/gui/curses/Makefile.am b/weechat/src/gui/curses/Makefile.am
index 771ece40d..2f885de8f 100644
--- a/weechat/src/gui/curses/Makefile.am
+++ b/weechat/src/gui/curses/Makefile.am
@@ -19,12 +19,11 @@ INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
 
 bin_PROGRAMS = weechat-curses
 
-weechat_curses_LDADD = ../../common/lib_weechat_main.a \
+weechat_curses_LDADD = ../lib_weechat_gui_common.a \
+                       ../../common/lib_weechat_main.a \
                        ../../irc/lib_weechat_irc.a \
                        $(NCURSES_LIBS) \
                        ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
 
-weechat_curses_SOURCES = ../gui.h \
-                         ../gui-common.c \
-                         gui-display.c \
+weechat_curses_SOURCES = gui-display.c \
 			             gui-input.c