pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16239] branches/v2_0_0/configure.ac

[<fac...@us...>]

Revision: 16239
Author:   faceprint
Date:     2006-06-10 10:45:31 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16239&view=rev

Log Message:
-----------
this should be in 2.0.0 as well

Modified Paths:
--------------
    branches/v2_0_0/configure.ac
Modified: branches/v2_0_0/configure.ac
===================================================================
--- branches/v2_0_0/configure.ac	2006-06-10 17:39:15 UTC (rev 16238)
+++ branches/v2_0_0/configure.ac	2006-06-10 17:45:31 UTC (rev 16239)
@@ -178,6 +178,7 @@
 PKG_CHECK_MODULES(LIBXML, libxml-2.0, ,enable_libxml=no)
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
+AC_ARG_ENABLE(libxml,[  --disable-libxml     compile without libxml2 support],enable_libxml=no)
 if test "x$enable_libxml" = "xyes"; then
 	AC_DEFINE(HAVE_LIBXML, 1, [Use libxml2 for xml parsing])
 fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16242] branches/v2_0_0/configure.ac

[<fac...@us...>]

Revision: 16242
Author:   faceprint
Date:     2006-06-10 11:10:39 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16242&view=rev

Log Message:
-----------
autotools continues to confuse me

Modified Paths:
--------------
    branches/v2_0_0/configure.ac
Modified: branches/v2_0_0/configure.ac
===================================================================
--- branches/v2_0_0/configure.ac	2006-06-10 18:09:57 UTC (rev 16241)
+++ branches/v2_0_0/configure.ac	2006-06-10 18:10:39 UTC (rev 16242)
@@ -174,12 +174,12 @@
 dnl #################
 dnl # LibXML2
 dnl #################
-enable_libxml=yes
-PKG_CHECK_MODULES(LIBXML, libxml-2.0, ,enable_libxml=no)
+enable_libxml2=yes
+PKG_CHECK_MODULES(LIBXML, libxml-2.0, ,enable_libxml2=no)
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
-AC_ARG_ENABLE(libxml,[  --disable-libxml     compile without libxml2 support],enable_libxml=no)
-if test "x$enable_libxml" = "xyes"; then
+AC_ARG_ENABLE(libxml,[  --disable-libxml     compile without libxml2 support],enable_libxml2=no)
+if test "x$enable_libxml2" = "xyes"; then
 	AC_DEFINE(HAVE_LIBXML, 1, [Use libxml2 for xml parsing])
 fi
 
@@ -1797,6 +1797,7 @@
 eval echo DBUS servies directory........ : $DBUS_SERVICES_DIR
 fi
 echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+echo Build with libxml2 support.... : $enable_libxml2
 echo Has you....................... : yes
 echo
 echo


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16298] branches/v2_0_0/configure.ac

[<de...@us...>]

Revision: 16298
Author:   deryni9
Date:     2006-06-20 14:39:33 -0700 (Tue, 20 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16298&view=rev

Log Message:
-----------
Merging revision 16297 from HEAD.
Original commit message:
Report 'no' when not building with these libraries, instead of reporting
nothing and having the next message on the same line.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16297&view=rev

Modified Paths:
--------------
    branches/v2_0_0/configure.ac
Modified: branches/v2_0_0/configure.ac
===================================================================
--- branches/v2_0_0/configure.ac	2006-06-20 16:04:00 UTC (rev 16297)
+++ branches/v2_0_0/configure.ac	2006-06-20 21:39:33 UTC (rev 16298)
@@ -163,7 +163,11 @@
 dnl # GStreamer
 dnl #######################################################################
 enable_gst=yes
-PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, ,enable_gst=no)
+PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], ,
+		  [
+		   AC_MSG_RESULT(no)
+		   enable_gst=no
+		  ])
 AC_SUBST(GSTREAMER_CFLAGS)
 AC_SUBST(GSTREAMER_LIBS)
 AC_ARG_ENABLE(gstreamer,[  --disable-gstreamer     compile without GStreamer audio support],enable_gst=no)
@@ -175,7 +179,11 @@
 dnl # LibXML2
 dnl #################
 enable_libxml2=yes
-PKG_CHECK_MODULES(LIBXML, libxml-2.0, ,enable_libxml2=no)
+PKG_CHECK_MODULES(LIBXML, [libxml-2.0], ,
+		  [
+		   AC_MSG_RESULT(no)
+		   enable_libxml2=no
+		  ])
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 AC_ARG_ENABLE(libxml,[  --disable-libxml     compile without libxml2 support],enable_libxml2=no)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.