gmime r1244 - in trunk: . examples gmime src tests

[fejj svn gnome org]

Author: fejj
Date: Sat May 24 00:56:52 2008
New Revision: 1244
URL: http://svn.gnome.org/viewvc/gmime?rev=1244&view=rev

Log:
2008-05-23  Jeffrey Stedfast  <fejj novell com>

	* branched: now begins 2.3.x development

	* gmime-2.4.pc.in: Renamed from gmime-2.0.pc.in.

	* gmime-config.in: Removed.

	* gmimeConf.sh.in: Removed.

	* configure.in: Updated.

	* */Makefile.am: Rename lib name to gmime-2.4.



Added:
   trunk/gmime-2.4.pc.in
Removed:
   trunk/gmime-2.0.pc.in
   trunk/gmime-config.in
   trunk/gmimeConf.sh.in
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/README
   trunk/configure.in
   trunk/examples/Makefile.am
   trunk/gmime/Makefile.am
   trunk/src/Makefile.am
   trunk/tests/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat May 24 00:56:52 2008
@@ -14,23 +14,16 @@
 
 SUBDIRS += .
 
-bin_SCRIPTS = gmime-config
-
 ## We create gmimeConf.sh here and not from configure because we want
 ## to get the paths expanded correctly.  Macros like srcdir are given
 ## the value NONE in configure if the user doesn't specify them (this
 ## is an autoconf feature, not a bug).
 
-CLEANFILES = gmimeConf.sh
 DISTCLEANFILES = iconv-detect.h
 
-confexecdir = $(libdir)
-confexec_DATA = gmimeConf.sh
-
 EXTRA_DIST = 			\
 	PORTING			\
-	gmimeConf.sh.in 	\
-	gmime-2.0.pc.in		\
+	gmime-2.4.pc.in		\
 	gmime.spec.in 		\
 	iconv-detect.c		\
 	zentimer.h 		\
@@ -41,21 +34,11 @@
 	gmime.spec
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gmime-2.0.pc
+pkgconfig_DATA = gmime-2.4.pc
 
 $(pkgconfig_DATA): config.status
 
-gmimeConf.sh: gmimeConf.sh.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's?\ GMIME_LIBDIR\@?$(GMIME_LIBDIR)?g' \
-	    -e 's?\ GMIME_INCLUDEDIR\@?$(GMIME_INCLUDEDIR)?g' \
-	    -e 's?\ GMIME_CFLAGS\@?$(GMIME_CFLAGS)?g' \
-	    -e 's?\ GMIME_LIBS\@?$(GMIME_LIBS)?g' \
-	    -e 's?\ VERSION\@?$(VERSION)?g' \
-	      < $(srcdir)/gmimeConf.sh.in > gmimeConf.tmp \
-	  && mv gmimeConf.tmp gmimeConf.sh
-
-$(libgmime_2_0_la_SOURCES): $(srcdir)/gmime
+$(libgmime_2_4_la_SOURCES): $(srcdir)/gmime
 
 dist-hook: gmime.spec
 	-cp gmime.spec $(distdir)

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Sat May 24 00:56:52 2008
@@ -1,4 +1,4 @@
-                            GMime, version 2.2.21
+                            GMime, version 2.3.0
                    by Jeffrey Stedfast <fejj gnome org>
 
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat May 24 00:56:52 2008
@@ -11,8 +11,8 @@
 # glib_libs:    libs to store in gmime-config
 
 GMIME_MAJOR_VERSION=2
-GMIME_MINOR_VERSION=2
-GMIME_MICRO_VERSION=21
+GMIME_MINOR_VERSION=3
+GMIME_MICRO_VERSION=0
 GMIME_VERSION=$GMIME_MAJOR_VERSION.$GMIME_MINOR_VERSION.$GMIME_MICRO_VERSION
 GMIME_VERSION_INFO=`expr $GMIME_MAJOR_VERSION + $GMIME_MINOR_VERSION`:$GMIME_MICRO_VERSION:$GMIME_MINOR_VERSION
 
@@ -497,8 +497,8 @@
 AC_SUBST(LIBS)
 
 GMIME_LIBDIR="-L${libdir}"
-GMIME_INCLUDEDIR="-I${includedir}/gmime-2.0"
-GMIME_LIBS="-lgmime-2.0 $EXTRA_LIBS"
+GMIME_INCLUDEDIR="-I${includedir}/gmime-2.4"
+GMIME_LIBS="-lgmime-2.4 $EXTRA_LIBS"
 
 AC_SUBST(GMIME_LIBS)
 AC_SUBST(GMIME_LIBDIR)
@@ -520,8 +520,7 @@
 mono/gmime-sharp.pc
 src/Makefile
 tests/Makefile
-gmime-config
-gmime-2.0.pc
+gmime-2.4.pc
 gmime.spec
 )
 

Modified: trunk/examples/Makefile.am
==============================================================================
--- trunk/examples/Makefile.am	(original)
+++ trunk/examples/Makefile.am	Sat May 24 00:56:52 2008
@@ -10,11 +10,11 @@
 
 DEPS = 						\
 	$(top_builddir)/util/libutil.la		\
-	$(top_builddir)/gmime/libgmime-2.0.la
+	$(top_builddir)/gmime/libgmime-2.4.la
 
 LDADDS = 					\
 	$(top_builddir)/util/libutil.la		\
-	$(top_builddir)/gmime/libgmime-2.0.la 	\
+	$(top_builddir)/gmime/libgmime-2.4.la 	\
 	$(GLIB_LIBS)
 
 basic_example_SOURCES = basic-example.c

Added: trunk/gmime-2.4.pc.in
==============================================================================
--- (empty file)
+++ trunk/gmime-2.4.pc.in	Sat May 24 00:56:52 2008
@@ -0,0 +1,12 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+
+Name: GMime
+Version: @VERSION@
+Description: MIME parser and utility library
+Requires: glib-2.0,gobject-2.0
+Libs: -L${libdir} @GMIME_LIBS@
+Cflags: -I${includedir}/gmime-2.0 @GMIME_CFLAGS@

Modified: trunk/gmime/Makefile.am
==============================================================================
--- trunk/gmime/Makefile.am	(original)
+++ trunk/gmime/Makefile.am	Sat May 24 00:56:52 2008
@@ -2,7 +2,7 @@
 
 SUBDIRS = .
 
-gmimeincludedir = $(includedir)/gmime-2.0/gmime
+gmimeincludedir = $(includedir)/gmime-2.4/gmime
 
 INCLUDES = 				\
 	-I$(top_srcdir) 		\
@@ -20,9 +20,9 @@
 
 noinst_PROGRAMS = gen-table charset-map
 
-lib_LTLIBRARIES = libgmime-2.0.la
+lib_LTLIBRARIES = libgmime-2.4.la
 
-libgmime_2_0_la_SOURCES = 		\
+libgmime_2_4_la_SOURCES = 		\
 	gmime.c				\
 	gmime-charset.c			\
 	gmime-cipher-context.c		\
@@ -137,17 +137,17 @@
 
 if OS_WIN32
 install-libtool-import-lib:
-	$(INSTALL) .libs/libgmime-2.0.dll.a $(DESTDIR)$(libdir)
+	$(INSTALL) .libs/libgmime-2.4.dll.a $(DESTDIR)$(libdir)
 
 uninstall-libtool-import-lib:
-	-rm $(DESTDIR)$(libdir)/libgmime-2.0.dll.a
+	-rm $(DESTDIR)$(libdir)/libgmime-2.4.dll.a
 else
 install-libtool-import-lib:
 uninstall-libtool-import-lib:
 endif
 
-libgmime_2_0_la_LIBADD = $(top_builddir)/util/libutil.la $(GLIB_LIBS)
-libgmime_2_0_la_LDFLAGS = \
+libgmime_2_4_la_LIBADD = $(top_builddir)/util/libutil.la $(GLIB_LIBS)
+libgmime_2_4_la_LDFLAGS = \
 	-version-info $(GMIME_VERSION_INFO) \
 	-export-dynamic $(no_undefined)
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat May 24 00:56:52 2008
@@ -8,11 +8,11 @@
 
 DEPS = 						\
 	$(top_builddir)/util/libutil.la		\
-	$(top_builddir)/gmime/libgmime-2.0.la
+	$(top_builddir)/gmime/libgmime-2.4.la
 
 LDADDS = 					\
 	$(top_builddir)/util/libutil.la		\
-	$(top_builddir)/gmime/libgmime-2.0.la 	\
+	$(top_builddir)/gmime/libgmime-2.4.la 	\
 	$(GLIB_LIBS)
 
 if SYSTEM_GETOPT

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Sat May 24 00:56:52 2008
@@ -33,8 +33,8 @@
 
 noinst_PROGRAMS = $(AUTOMATED_TESTS) $(MANUAL_TESTS)
 
-DEPS = $(top_builddir)/gmime/libgmime-2.0.la
-LDADDS = $(top_builddir)/gmime/libgmime-2.0.la $(GLIB_LIBS)
+DEPS = $(top_builddir)/gmime/libgmime-2.4.la
+LDADDS = $(top_builddir)/gmime/libgmime-2.4.la $(GLIB_LIBS)
 
 test_best_SOURCES = test-best.c
 test_best_LDFLAGS =