[libexif-cvs] libexif Makefile.am,1.39,1.40 configure.ac,1.11,1.12

[Hans U. N. <hu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23153

Modified Files:
	Makefile.am configure.ac 
Log Message:
help support tarball/zip distributions with binaries

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- configure.ac	28 Sep 2005 06:48:27 -0000	1.11
+++ configure.ac	26 Dec 2005 00:39:50 -0000	1.12
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 AC_INIT([EXIF library],[0.6.13],[lib...@li...],[libexif])
 AC_CONFIG_SRCDIR([libexif/exif-data.h])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2])
+AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2 dist-zip])
 
 if test ! -d "$srcdir/m4m"; then
 AC_MSG_ERROR([
@@ -59,6 +59,22 @@ dnl that will always be available
 AX_NEED_STDINT_H([libexif/_stdint.h])
 
 
+dnl ------------------------------------------------------------------------
+dnl Whether we're supposed to ship binaries in the tarball
+dnl ------------------------------------------------------------------------
+
+ship_binaries=false
+AC_ARG_ENABLE([ship-binaries],
+[AS_HELP_STRING([--enable-ship-binaries],
+[Whether to ship binaries in the tarball [default=no]])],[
+	if test x$enableval = xyes; then
+		ship_binaries=true
+	fi
+])
+AM_CONDITIONAL([SHIP_BINARIES],[$ship_binaries])
+GP_CONFIG_MSG([Ship binaries in tarball],[$ship_binaries])
+
+
 dnl ---------------------------------------------------------------------------
 dnl Whether -lm is required for our math functions
 dnl ---------------------------------------------------------------------------
@@ -148,6 +164,7 @@ AC_CONFIG_FILES([ 
   doc/Doxyfile
   doc/Doxyfile-internals
   libexif/libexif.pc
+  binary/Makefile
 ])
 AC_OUTPUT
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -d -r1.39 -r1.40
--- Makefile.am	12 Apr 2005 03:27:08 -0000	1.39
+++ Makefile.am	26 Dec 2005 00:39:50 -0000	1.40
@@ -1,6 +1,10 @@
-SUBDIRS = m4m po libexif test doc
+SUBDIRS = m4m po libexif test doc binary
 
-EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh
+if SHIP_BINARIES
+README_W32_XDIST = README-Win32.txt
+endif
+
+EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST)
 
 ACLOCAL_AMFLAGS = -I m4m
 
@@ -30,7 +34,7 @@ $(srcdir)/ChangeLog.cvs:
 		usermap=""; \
 	fi; \
 	(cd "$(srcdir)" && cvs2cl $${usermap} -f "ChangeLog.cvs")
-	
+
 .PHONY: cvs-tag-release
 cvs-tag-release:
 	@tag="$$(echo "$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-release" | sed 's|\.|_|g')"; \