[bwm-tools-devel] COMMIT - r48 - in trunk: . doc lib
Brought to you by:
nkukard
Menu
▾
▴
[bwm-tools-devel] COMMIT - r48 - in trunk: . doc lib
|
From: SVN C. <sv...@li...> - 2005-01-19 17:02:59
|
Author: nkukard
Date: 2005-01-19 19:02:38 +0200 (Wed, 19 Jan 2005)
New Revision: 48
Modified:
trunk/aclocal.m4
trunk/configure
trunk/configure.ac
trunk/doc/stamp-vti
trunk/doc/version.texi
trunk/lib/Makefile.am
Log:
* Adjusted versioning for required libs
* Automake 1.7 can be used
* Fixed "bug" in xml cflags determination
* Removed some crud that made its way into lib/Makefile.am
Modified: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4 2005-01-19 14:04:42 UTC (rev 47)
+++ trunk/aclocal.m4 2005-01-19 17:02:38 UTC (rev 48)
@@ -32,6 +32,9 @@
gmodule)
pkg_config_args="$pkg_config_args gmodule-2.0"
;;
+ gmodule-no-export)
+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+ ;;
gobject)
pkg_config_args="$pkg_config_args gobject-2.0"
;;
Modified: trunk/configure
===================================================================
--- trunk/configure 2005-01-19 14:04:42 UTC (rev 47)
+++ trunk/configure 2005-01-19 17:02:38 UTC (rev 48)
@@ -22753,7 +22753,7 @@
done
-# Check for glib 2.4.0
+# Check for glib 2.2.0
# Check whether --enable-glibtest or --disable-glibtest was given.
if test "${enable_glibtest+set}" = set; then
enableval="$enable_glibtest"
@@ -22769,6 +22769,9 @@
gmodule)
pkg_config_args="$pkg_config_args gmodule-2.0"
;;
+ gmodule-no-export)
+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+ ;;
gobject)
pkg_config_args="$pkg_config_args gobject-2.0"
;;
@@ -22833,7 +22836,7 @@
no_glib=yes
fi
- min_glib_version=2.4.0
+ min_glib_version=2.2.0
echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6
@@ -23077,11 +23080,11 @@
then
echo
echo "* - ERROR -"
- echo "* glib >= 2.4.0 required, this includes the development libraries and headers"
+ echo "* glib >= 2.2.0 required, this includes the development libraries and headers"
exit 1
fi
-# Check for libxml 2.6.0
+# Check for libxml 2.5.0
# Check whether --with-xml-prefix or --without-xml-prefix was given.
@@ -23160,7 +23163,7 @@
echo "${ECHO_T}no" >&6
fi
- min_xml_version=2.6.0
+ min_xml_version=2.5.0
echo "$as_me:$LINENO: checking for libxml - version >= $min_xml_version" >&5
echo $ECHO_N "checking for libxml - version >= $min_xml_version... $ECHO_C" >&6
no_xml=""
@@ -23390,7 +23393,7 @@
then
echo
echo "* - ERROR -"
- echo "* libxml >= 2.6.0 required, this includes the development libraries and headers"
+ echo "* libxml >= 2.5.0 required, this includes the development libraries and headers"
exit 1
fi
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-01-19 14:04:42 UTC (rev 47)
+++ trunk/configure.ac 2005-01-19 17:02:38 UTC (rev 48)
@@ -26,7 +26,7 @@
AC_GNU_SOURCE
-AM_INIT_AUTOMAKE(1.8)
+AM_INIT_AUTOMAKE(1.7)
# Checks for programs.
@@ -95,27 +95,30 @@
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([gettimeofday inet_ntoa memset select socket strcasecmp strchr strdup strerror strncasecmp strndup])
-# Check for glib 2.4.0
-AM_PATH_GLIB_2_0(2.4.0,have_glib=yes,have_glib=no,gthread)
+# Check for glib 2.2.0
+AM_PATH_GLIB_2_0(2.2.0,have_glib=yes,have_glib=no,gthread)
if test x"$have_glib" = x"no"
then
echo
echo "* - ERROR -"
- echo "* glib >= 2.4.0 required, this includes the development libraries and headers"
+ echo "* glib >= 2.2.0 required, this includes the development libraries and headers"
exit 1
fi
-# Check for libxml 2.6.0
-AM_PATH_XML2(2.6.0,have_xml=yes,have_xml=no)
+# Check for libxml 2.5.0
+AM_PATH_XML2(2.5.0,have_xml=yes,have_xml=no)
if test x"$have_xml" = x"no"
then
echo
echo "* - ERROR -"
- echo "* libxml >= 2.6.0 required, this includes the development libraries and headers"
+ echo "* libxml >= 2.5.0 required, this includes the development libraries and headers"
exit 1
fi
-XML_CFLAGS=$XML_CPPFLAGS
+if test x"$XML_CFLAGS" = x
+then
+ XML_CFLAGS=$XML_CPPFLAGS
+fi
AC_SUBST(XML_CFLAGS)
Modified: trunk/doc/stamp-vti
===================================================================
--- trunk/doc/stamp-vti 2005-01-19 14:04:42 UTC (rev 47)
+++ trunk/doc/stamp-vti 2005-01-19 17:02:38 UTC (rev 48)
@@ -1,4 +1,4 @@
-@set UPDATED 10 January 2005
+@set UPDATED 19 January 2005
@set UPDATED-MONTH January 2005
@set EDITION devel
@set VERSION devel
Modified: trunk/doc/version.texi
===================================================================
--- trunk/doc/version.texi 2005-01-19 14:04:42 UTC (rev 47)
+++ trunk/doc/version.texi 2005-01-19 17:02:38 UTC (rev 48)
@@ -1,4 +1,4 @@
-@set UPDATED 10 January 2005
+@set UPDATED 19 January 2005
@set UPDATED-MONTH January 2005
@set EDITION devel
@set VERSION devel
Modified: trunk/lib/Makefile.am
===================================================================
--- trunk/lib/Makefile.am 2005-01-19 14:04:42 UTC (rev 47)
+++ trunk/lib/Makefile.am 2005-01-19 17:02:38 UTC (rev 48)
@@ -26,6 +26,6 @@
lib_LTLIBRARIES = libbwm.la
libbwm_la_SOURCES = xmlConf.c misc.c
-libbwm_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) $(GMIME_CFLAGS) $(AM_CFLAGS)
-libbwm_la_LDFLAGS = $(GLIB_LIBS) $(XML_LIBS) $(GMIME_LIBS) -version-info 1:0:0
+libbwm_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) $(AM_CFLAGS)
+libbwm_la_LDFLAGS = $(GLIB_LIBS) $(XML_LIBS) -version-info 1:0:0
|
