Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30544
Modified Files:
ChangeLog autogen.sh configure.in
Log Message:
2006-04-05 Sven Herzberg <he...@gn...>
* autogen.sh: enable maintainer mode
* configure.in: don't allow GLib 2.x and GTK+ 1.x
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gqclient/gq/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** ChangeLog 4 Apr 2006 23:52:49 -0000 1.62
--- ChangeLog 4 Apr 2006 23:58:54 -0000 1.63
***************
*** 1,4 ****
--- 1,9 ----
2006-04-05 Sven Herzberg <he...@gn...>
+ * autogen.sh: enable maintainer mode
+ * configure.in: don't allow GLib 2.x and GTK+ 1.x
+
+ 2006-04-05 Sven Herzberg <he...@gn...>
+
* acinclude.m4: fixed aclocal warnings
Index: autogen.sh
===================================================================
RCS file: /cvsroot/gqclient/gq/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** autogen.sh 4 Apr 2006 23:34:47 -0000 1.1
--- autogen.sh 4 Apr 2006 23:58:54 -0000 1.2
***************
*** 15,17 ****
autoconf || (echo "Please install autoconf"; exit 1)
echo "Running ./configure $@"
! ./configure $@
--- 15,17 ----
autoconf || (echo "Please install autoconf"; exit 1)
echo "Running ./configure $@"
! ./configure --enable-maintainer-mode $@
Index: configure.in
===================================================================
RCS file: /cvsroot/gqclient/gq/configure.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** configure.in 4 Apr 2006 23:34:47 -0000 1.59
--- configure.in 4 Apr 2006 23:58:54 -0000 1.60
***************
*** 181,186 ****
--- 181,200 ----
fi
+ dnl --------------------------------------------------------
+ dnl | make sure the detected GTK+ and GLib fit to each other |----------------
+ dnl --------------------------------------------------------
+
+ dnl This way we avoid GQ being linked against GLib 2.0 (found), GTK+ 1.2
+ dnl (found) and GLib 1.2 (required by GTK+ 1.2)
+
+ AC_MSG_CHECKING([for GLib and GTK+ compatibility])
+ if test "x$GLIB_MAJOR" = "x$GTK_MAJOR"; then
+ AC_MSG_RESULT([okay])
+ else
+ AC_MSG_ERROR([your GLib version ($GLIB_MAJOR.x) doesn't fit to your GTK+ version ($GTK_MAJOR.x)])
+ fi
+ dnl --------------------------------------------------------------------------
AC_CHECK_TYPE(gunichar,
|
