2003-06-22 Anders Carlsson <andersca@codefactory.se>

	* configure.in: Add AM_PROG_GCJ and move AM_PROG_LIBTOOL
	after the gcj checks so that the correct configuration tags
	will be added to libtool.

diff --git a/ChangeLog b/ChangeLog
index 098a585..377ceb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-06-22  Anders Carlsson  <andersca@codefactory.se>
 
+       * configure.in: Add AM_PROG_GCJ and move AM_PROG_LIBTOOL
+       after the gcj checks so that the correct configuration tags
+       will be added to libtool.
+
        * dbus-glib-1.pc.in: No need to specify any includes since
        dbus-1.pc.in has those.
 

diff --git a/configure.in b/configure.in
index f2ca23e..53b65fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,6 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_ISC_POSIX
 AC_HEADER_STDC
-AM_PROG_LIBTOOL
 
 AC_ARG_ENABLE(qt,               [  --enable-qt           enable Qt-friendly client library],enable_qt=$enableval,enable_qt=auto)
 AC_ARG_ENABLE(glib,             [  --enable-glib         enable GLib-friendly client library],enable_glib=$enableval,enable_glib=auto)
@@ -140,12 +139,14 @@ AC_CHECK_PROGS(GCJ, gcj, gcj)
 if test -z "$GCJ" ; then
      have_gcj=no
 else
+     # Needs to be here so libtool wont get confused
+     AM_PROG_GCJ
+
      have_gcj=yes
      if test "x${GCJFLAGS-unset}" = xunset; then
         GCJFLAGS="-g -O2 -Wall"
      fi
      AC_SUBST(GCJFLAGS)
-     _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(GCJ)])
 fi
 
 if test x$enable_gcj = xauto ; then
@@ -164,6 +165,8 @@ fi
 
 AM_CONDITIONAL(DBUS_USE_GCJ, test x$enable_gcj = xyes)
 
+AM_PROG_LIBTOOL
+
 #### Look for mono
 AC_CHECK_TOOL(MCS, mcs, mcs)
 if test -z "$MCS" ; then