diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | autogen.sh | 41 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libempathy-gtk/Makefile.am | 5 |
4 files changed, 56 insertions, 5 deletions
@@ -1,5 +1,14 @@ 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: * doc/*: * Makefile.am: Adding initial API documentation using gtk-doc. diff --git a/autogen.sh b/autogen.sh index 371172140..63467a5db 100755 --- a/autogen.sh +++ b/autogen.sh @@ -22,6 +22,47 @@ CONFIGURE=configure.ac 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." diff --git a/configure.ac b/configure.ac index 923de0648..747b6d586 100644 --- a/configure.ac +++ b/configure.ac @@ -139,8 +139,8 @@ AC_OUTPUT([ 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 653c26811..57e2c5198 100644 --- 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-ui-utils.c \ + empathy-ui-utils.c \ 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-ui-utils.h + empathy-ui-utils.h \ + empathy-account-widget-msn.h gladedir = $(datadir)/empathy glade_DATA = \ |