Fix missing header for EmpathyAccountWidgetMSN.

2007-07-12 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/Makefile.am: Fix missing header for
	EmpathyAccountWidgetMSN.

	* configure.ac: Fix useless "\".

	* autogen.sh: run gtkdocize if needed.

svn path=/trunk/; revision=183

diff --git a/ChangeLog b/ChangeLog
index b4485776f7427e1f6208efe33f69328f53e3770a..86aa137506bd2c22a872f4570e3f7d3d35ab2aa4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-12 Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy-gtk/Makefile.am: Fix missing header for
+       EmpathyAccountWidgetMSN.
+
+       * configure.ac: Fix useless "\".
+
+       * autogen.sh: run gtkdocize if needed.
+

 2007-07-12 Xavier Claessens  <xclaesse@gmail.com>
 
        * configure.ac:
 2007-07-12 Xavier Claessens  <xclaesse@gmail.com>
 
        * configure.ac:

diff --git a/autogen.sh b/autogen.sh
index 3711721406b3bf04882c1189bff0b3b02f9d1c63..63467a5db4269fad90771ff2ed6f39f0e7242752 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,6 +22,47 @@ CONFIGURE=configure.ac
 
 DIE=0
 
 
 DIE=0
 

+# check if gtk-doc is explicitely disabled
+for ag_option in $AUTOGEN_CONFIGURE_ARGS $@
+do
+  case $ag_option in
+    -disable-gtk-doc | --disable-gtk-doc)
+    enable_gtk_doc=no
+  ;;
+  esac
+done
+
+if test x$enable_gtk_doc = xno; then
+  echo "skipping test for gtkdocize"
+else
+  echo -n "checking for gtkdocize ... "
+  if (gtkdocize --version) < /dev/null > /dev/null 2>&1; then
+      echo "yes"
+  else
+      echo
+      echo "  You must have gtk-doc installed to compile $PROJECT."
+      echo "  Install the appropriate package for your distribution,"
+      echo "  or get the source tarball at"
+      echo "  http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
+      echo "  You can also use the option --disable-gtk-doc to skip"
+      echo "  this test but then you will not be able to generate a"
+      echo "  configure script that can build the API documentation."
+      DIE=1
+  fi
+fi
+
+if test x$enable_gtk_doc = xno; then
+    if test -f gtk-doc.make; then :; else
+       echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
+    fi
+    echo "WARNING: You have disabled gtk-doc."
+    echo "         As a result, you will not be able to generate the API"
+    echo "         documentation and 'make dist' will not work."
+    echo
+else
+    gtkdocize || exit $?
+fi
+

 ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {
        echo
        echo "You must have autoconf installed to compile $PROJECT."
 ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {
        echo
        echo "You must have autoconf installed to compile $PROJECT."

diff --git a/configure.ac b/configure.ac
index 923de064805f80a8b701d1f9e4eea9a160553db0..747b6d586701ca6945f961173c0a3de11e88825f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -139,8 +139,8 @@ AC_OUTPUT([
   libempathy-gtk/Makefile
   libempathy-gtk/libempathy-gtk.pc
   src/Makefile
   libempathy-gtk/Makefile
   libempathy-gtk/libempathy-gtk.pc
   src/Makefile

-  doc/Makefile \
-  doc/libempathy/Makefile \
-  doc/libempathy-gtk/Makefile \
+  doc/Makefile
+  doc/libempathy/Makefile
+  doc/libempathy-gtk/Makefile

 ])
 
 ])
 

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 653c26811d1f11ba93fed9e1fc03e0fee7e503ac..57e2c51980532f5cc619e5d18d1c7ae0b5d8a2e7 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -39,7 +39,7 @@ libempathy_gtk_la_SOURCES =                   \
        empathy-new-chatroom-dialog.c           \
        empathy-chatrooms-window.c              \
        empathy-log-window.c                    \
        empathy-new-chatroom-dialog.c           \
        empathy-chatrooms-window.c              \
        empathy-log-window.c                    \

-       empathy-ui-utils.c                     \
+       empathy-ui-utils.c                      \

        empathy-account-widget-msn.c
 
 libempathy_gtk_la_LIBADD =                     \
        empathy-account-widget-msn.c
 
 libempathy_gtk_la_LIBADD =                     \


@@ -79,7 +79,8 @@ libempathy_gtk_HEADERS =                      \
        empathy-new-chatroom-dialog.h           \
        empathy-chatrooms-window.h              \
        empathy-log-window.h                    \
        empathy-new-chatroom-dialog.h           \
        empathy-chatrooms-window.h              \
        empathy-log-window.h                    \

-       empathy-ui-utils.h
+       empathy-ui-utils.h                      \
+       empathy-account-widget-msn.h

 
 gladedir = $(datadir)/empathy
 glade_DATA =                                   \
 
 gladedir = $(datadir)/empathy
 glade_DATA =                                   \