libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] gexif ChangeLog,1.8,1.9 configure.in,1.11,1.12

[<lu...@us...>]

Update of /cvsroot/libexif/gexif
In directory usw-pr-cvs1:/tmp/cvs-serv4263

Modified Files:
	ChangeLog configure.in 
Log Message:

2002-09-15  Lutz Müller <lu...@us...>

	* configure.in:
	* po/es.po: Spanish translation by Fabian Mandelbaum
	  <fa...@2v...>


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/gexif/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	23 Jul 2002 08:21:12 -0000	1.8
+++ ChangeLog	15 Sep 2002 10:24:13 -0000	1.9
@@ -1,3 +1,9 @@
+2002-09-15  Lutz Müller <lu...@us...>
+
+	* configure.in:
+	* po/es.po: Spanish translation by Fabian Mandelbaum
+	  <fa...@2v...>
+
 2002-07-23  Lutz Müller <lu...@us...>
 
 	* configure.in: Version 0.4

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/gexif/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- configure.in	13 Sep 2002 15:37:16 -0000	1.11
+++ configure.in	15 Sep 2002 10:24:13 -0000	1.12
@@ -9,7 +9,7 @@
 dnl ---------------------------------------------------------------------------
 dnl i18n support
 dnl ---------------------------------------------------------------------------
-ALL_LINGUAS="de"
+ALL_LINGUAS="de es"
 AM_GNU_GETTEXT
 
 dnl ---------------------------------------------------------------------------

[libexif-cvs] libexif-gtk/po es.po,NONE,1.1

[<lu...@us...>]

Update of /cvsroot/libexif/libexif-gtk/po
In directory usw-pr-cvs1:/tmp/cvs-serv3992/po

Added Files:
	es.po 
Log Message:

2002-09-15  Lutz Müller <lu...@us...>

	* configure.in:
	* po/es.po: Spanish translation by Fabian Mandelbaum
	  <fa...@2v...>


--- NEW FILE: es.po ---
# libexif-gtk Spanish Translation.
# Copyright (C) 2002 Free Software Foundation, Inc.
# Fabian Mandelbaum <fa...@ma...>, 2002.
#
msgid ""
msgstr ""
"Project-Id-Version: libexif-gtk\n"
"POT-Creation-Date: 2002-07-25 19:01+0200\n"
"PO-Revision-Date: 2002-09-05 22:32-0300\n"
"Last-Translator: Fabian Mandelbaum <fa...@ma...>\n"
"Language-Team: Spanish <es...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"

#: libexif-gtk/gtk-exif-browser.c:367
msgid "No thumbnail available."
msgstr "Sin diapositiva disponible."

#: libexif-gtk/gtk-exif-browser.c:375
msgid "Could not parse thumbnail data."
msgstr "No se pueden analizar datos de diapositiva."

#: libexif-gtk/gtk-exif-browser.c:390
#, c-format
msgid "Size: %i byte(s)."
msgstr "Tamaño: %i byte(s)."

#: libexif-gtk/gtk-exif-browser.c:459
msgid "Load..."
msgstr "Cargar..."

#: libexif-gtk/gtk-exif-browser.c:499
msgid "Save As..."
msgstr "Guardar como..."

#: libexif-gtk/gtk-exif-browser.c:549
msgid "Thumbnail"
msgstr "Diapositiva"

#: libexif-gtk/gtk-exif-browser.c:566
msgid "Load"
msgstr "Cargar"

#: libexif-gtk/gtk-exif-browser.c:571
msgid "Save"
msgstr "Guardar"

#: libexif-gtk/gtk-exif-browser.c:576
msgid "Delete"
msgstr "Borrar"

[libexif-cvs] libexif-gtk ChangeLog,1.11,1.12 configure.in,1.13,1.14

[<lu...@us...>]

Update of /cvsroot/libexif/libexif-gtk
In directory usw-pr-cvs1:/tmp/cvs-serv3992

Modified Files:
	ChangeLog configure.in 
Log Message:

2002-09-15  Lutz Müller <lu...@us...>

	* configure.in:
	* po/es.po: Spanish translation by Fabian Mandelbaum
	  <fa...@2v...>


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	25 Jul 2002 16:17:11 -0000	1.11
+++ ChangeLog	15 Sep 2002 10:22:46 -0000	1.12
@@ -1,3 +1,9 @@
+2002-09-15  Lutz Müller <lu...@us...>
+
+	* configure.in:
+	* po/es.po: Spanish translation by Fabian Mandelbaum
+	  <fa...@2v...>
+
 2002-07-25  Lutz Müller <lu...@us...>
 
 	* configure.in: Version 0.3.2. Require libexif-0.5.4 or higher.

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- configure.in	13 Sep 2002 15:39:26 -0000	1.13
+++ configure.in	15 Sep 2002 10:22:46 -0000	1.14
@@ -33,7 +33,7 @@
 dnl ---------------------------------------------------------------------------
 dnl i18n support
 dnl ---------------------------------------------------------------------------
-ALL_LINGUAS=""
+ALL_LINGUAS="es"
 AM_GNU_GETTEXT
 
 dnl ---------------------------------------------------------------------------

[libexif-cvs] exif/po es.po,NONE,1.1

[<lu...@us...>]

Update of /cvsroot/libexif/exif/po
In directory usw-pr-cvs1:/tmp/cvs-serv3490/po

Added Files:
	es.po 
Log Message:

2002-09-15  Lutz Müller <lu...@us...>

	* configure.in:
	* po/es.po: Spanish translation by Fabian Mandelbaum
	  <fa...@2v...>


--- NEW FILE: es.po ---
# exif Spanish Translation.
# Copyright (C) 2002 Free Software Foundation, Inc.
# Fabian Mandelbaum <fa...@ma...>, 2002.
#
msgid ""
msgstr ""
"Project-Id-Version: exif\n"
"POT-Creation-Date: 2002-07-25 18:37+0200\n"
"PO-Revision-Date: 2002-09-03 20:07-0300\n"
"Last-Translator: Fabian Mandelbaum <fa...@ma...>\n"
"Language-Team: Spanish <es...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"

#: exif/main.c:70
#, c-format
msgid "Could not parse data of tag '%s'."
msgstr "No se pueden analizar los datos de la etiqueta '%s'."

#: exif/main.c:81
#, c-format
msgid "Tag '%s' does not contain known information."
msgstr "La etiqueta '%s' no contiene información conocida."

#: exif/main.c:86
#, c-format
msgid "Tag '%s' contains one piece of information:"
msgstr "La etiqueta '%s' contiene información:"

#: exif/main.c:90
#, c-format
msgid "Tag '%s' contains the following information:"
msgstr "La etiqueta '%s' contiene la información siguiente:"

#: exif/main.c:106
#, c-format
msgid "EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"
msgstr "La entrada EXIF '%s' (0x%x, '%s') existe en IFD '%s':"

#: exif/main.c:110
#, c-format
msgid "  Format: '%s'"
msgstr "  Formato: '%s'"

#: exif/main.c:112
#, c-format
msgid "  Components: %i"
msgstr "  Componentes: %i"

#: exif/main.c:114
#, c-format
msgid "  Value: '%s'"
msgstr "  Valor: '%s'"

#: exif/main.c:116
msgid "  Data:"
msgstr "  Datos:"

#: exif/main.c:148
#, c-format
msgid "Could not parse JPEG file '%s'."
msgstr "No se pudo analizar archivo JPEG '%s'."

#: exif/main.c:160 exif/main.c:328
#, c-format
msgid "Wrote file '%s'."
msgstr "Se escribió archivo '%s'."

#: exif/main.c:188
msgid "Show IDs instead of tag names"
msgstr "Mostrar IDs en vez de nombres de etiqueta"

#: exif/main.c:190
msgid "Select tag"
msgstr "Seleccionar etiqueta"

#: exif/main.c:190
msgid "tag"
msgstr "etiqueta"

#: exif/main.c:192
msgid "Select IFD"
msgstr "Seleccionar IFD"

#: exif/main.c:192
msgid "IFD"
msgstr "IFD"

#: exif/main.c:194
msgid "List all EXIF tags"
msgstr "Listar todas las etiquetas EXIF"

#: exif/main.c:196
msgid "Show description of tag"
msgstr "Mostrar descripción de la etiqueta"

#: exif/main.c:198
msgid "Extract thumbnail"
msgstr "Extraer diapositiva"

#: exif/main.c:200
msgid "Insert FILE as thumbnail"
msgstr "Insertar ARCHIVO como diapositiva"

#: exif/main.c:200 exif/main.c:202
msgid "FILE"
msgstr "ARCHIVO"

#: exif/main.c:202
msgid "Write output to FILE"
msgstr "Escribir salida en ARCHIVO"

#: exif/actions.c:136 exif/actions.c:138 exif/main.c:204
msgid "Value"
msgstr "Valor"

#: exif/main.c:216
msgid "[OPTION...] file"
msgstr "[OPCIÓN...] archivo"

#: exif/main.c:228
#, c-format
msgid "Invalid tag '%s'!"
msgstr "¡Etiqueta '%s' no válida!"

#: exif/main.c:238
#, c-format
msgid ""
"Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and "
"'Interoperability'."
msgstr "IFD '%s' no válido. Los IFD válidos son '0', '1', 'EXIF', 'GPS', e 'Interoperability'."

#: exif/main.c:248
msgid "Please specify a tag!"
msgstr "¡Especifique una etiqueta por favor!"

#: exif/main.c:252
#, c-format
msgid "Tag '%s' (0x%04x, '%s'): %s"
msgstr "Etiqueta '%s' (0x%04x, '%s'): %s"

#: exif/main.c:271
#, c-format
msgid "'%s' does not contain EXIF data!"
msgstr "¡'%s' no contiene datos EXIF!"

#: exif/main.c:296
#, c-format
msgid "IFD '%s' does not contain tag '%s'."
msgstr "IFD '%s' no contiene la etiqueta '%s'."

#: exif/main.c:310
#, c-format
msgid "'%s' does not contain a thumbnail!"
msgstr "¡'%s' no contiene una diapositiva!"

#: exif/main.c:321
#, c-format
msgid "Could not open '%s' for writing (%m)!"
msgstr "¡No se pudo abrir '%s' para escribir (%m)!"

#: exif/main.c:343
#, c-format
msgid "Could not open '%s' (%m)!"
msgstr "¡No se pudo abrir '%s' (%m)!"

#: exif/main.c:352
#, c-format
msgid "Could not allocate %i byte(s)."
msgstr "No se pudo asignar %i byte(s)."

#: exif/main.c:361
#, c-format
msgid "Could not read '%s' (%m)."
msgstr "No se pudo leer '%s' (%m)."

#: exif/main.c:374
msgid "You need to specify a tag!"
msgstr "¡Debe especificar una etiqueta!"

#: exif/main.c:382
msgid "You need to specify an IFD!"
msgstr "¡Debe especificar un IFD!"

#. e->data[s * i] = ;
#: exif/main.c:429 exif/main.c:465
msgid "Not yet implemented!"
msgstr "¡Todavía no implementado!"

#: exif/main.c:436
msgid "Internal error. Please contact <lib...@li...>."
msgstr "Error interno. Por favor, contacte con <lib...@li...>."

#: exif/main.c:447
msgid "Not enough memory."
msgstr "No hay memoria suficiente."

#: exif/actions.c:61
#, c-format
msgid "EXIF tags in '%s':"
msgstr "Etiquetas EXIF en '%s':"

#: exif/actions.c:126
#, c-format
msgid "EXIF tags in '%s' ('%s' byte order):"
msgstr "Etiquetas EXIF en '%s' ('%s' es el orden de bytes):"

#: exif/actions.c:131 exif/actions.c:133
msgid "Tag"
msgstr "Etiqueta"

#: exif/actions.c:144
#, c-format
msgid "EXIF data contains a thumbnail (%i bytes)."
msgstr "Los datos EXIF contienen una diapositiva (%i bytes)."

[libexif-cvs] exif ChangeLog,1.12,1.13 configure.in,1.8,1.9

[<lu...@us...>]

Update of /cvsroot/libexif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv3490

Modified Files:
	ChangeLog configure.in 
Log Message:

2002-09-15  Lutz Müller <lu...@us...>

	* configure.in:
	* po/es.po: Spanish translation by Fabian Mandelbaum
	  <fa...@2v...>


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	30 Aug 2002 07:05:48 -0000	1.12
+++ ChangeLog	15 Sep 2002 10:20:36 -0000	1.13
@@ -1,3 +1,9 @@
+2002-09-15  Lutz Müller <lu...@us...>
+
+	* configure.in:
+	* po/es.po: Spanish translation by Fabian Mandelbaum
+	  <fa...@2v...>
+
 2002-08-30  Lutz Müller <lu...@us...>
 
 	* exif/main.c: Make sure people don't try too save too much EXIF data.

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.in	13 Sep 2002 15:35:42 -0000	1.8
+++ configure.in	15 Sep 2002 10:20:36 -0000	1.9
@@ -9,7 +9,7 @@
 dnl ---------------------------------------------------------------------------
 dnl i18n support
 dnl ---------------------------------------------------------------------------
-ALL_LINGUAS="de"
+ALL_LINGUAS="de es"
 AM_GNU_GETTEXT
 
 dnl ---------------------------------------------------------------------------

[libexif-cvs] libexif ChangeLog,1.43,1.44 configure.in,1.25,1.26

[<lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv3505

Modified Files:
	ChangeLog configure.in 
Log Message:

2002-09-15  Lutz Müller <lu...@us...>

        * configure.in:
        * po/es.po: Spanish translation by Fabian Mandelbaum
          <fa...@2v...>


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ChangeLog	30 Aug 2002 07:05:42 -0000	1.43
+++ ChangeLog	15 Sep 2002 10:20:30 -0000	1.44
@@ -1,3 +1,9 @@
+2002-09-15  Lutz Müller <lu...@us...>
+
+        * configure.in:
+        * po/es.po: Spanish translation by Fabian Mandelbaum
+          <fa...@2v...>
+
 2002-08-30  Lutz Müller <lu...@us...>
 
 	* libexif/exif-data.c: Some cleanup.

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- configure.in	12 Sep 2002 18:03:42 -0000	1.25
+++ configure.in	15 Sep 2002 10:20:30 -0000	1.26
@@ -28,7 +28,7 @@
 dnl ---------------------------------------------------------------------------
 dnl i18n support
 dnl ---------------------------------------------------------------------------
-ALL_LINGUAS="de"
+ALL_LINGUAS="de es"
 AM_GNU_GETTEXT
 
 dnl ---------------------------------------------------------------------------

[libexif-cvs] libexif/po es.po,NONE,1.1

[<lu...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory usw-pr-cvs1:/tmp/cvs-serv3505/po

Added Files:
	es.po 
Log Message:

2002-09-15  Lutz Müller <lu...@us...>

        * configure.in:
        * po/es.po: Spanish translation by Fabian Mandelbaum
          <fa...@2v...>


--- NEW FILE: es.po ---
# libexif Spanish Translation.
# Copyright (C) 2002 Free Software Foundation, Inc.
# Fabian Mandelbaum <fa...@ma...>, 2002.
#
msgid ""
msgstr ""
"Project-Id-Version: libexif\n"
"POT-Creation-Date: 2002-07-25 18:32+0200\n"
"PO-Revision-Date: 2002-09-05 22:28-0300\n"
"Last-Translator: Fabian Mandelbaum <fa...@ma...>\n"
"Language-Team: Spanish <es...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"

#: libexif/exif-tag.c:53
msgid ""
"Indicates the identification of the Interoperability rule. Use \"R98\" for "
"stating ExifR98 Rules. Four bytes used including the termination code "
[...1572 lines suppressed...]

#: libexif/exif-entry.c:1250
msgid "landscape"
msgstr "paisaje"

#: libexif/exif-entry.c:1262
msgid "yes"
msgstr "sí"

#: libexif/exif-entry.c:1265
msgid "w/o strobe"
msgstr "sin estrosboscópica"

#: libexif/exif-entry.c:1268
msgid "w. strobe"
msgstr "con estrosboscópica"

#: libexif/exif-format.c:56
msgid "Undefined"
msgstr "Indefinido"

[libexif-cvs] exif/po de.po,1.4,1.5

[<hu...@us...>]

Update of /cvsroot/libexif/exif/po
In directory usw-pr-cvs1:/tmp/cvs-serv10416

Modified Files:
	de.po 
Log Message:
removed default value problems

Index: de.po
===================================================================
RCS file: /cvsroot/libexif/exif/po/de.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- de.po	25 Jul 2002 16:29:45 -0000	1.4
+++ de.po	14 Sep 2002 12:49:09 -0000	1.5
@@ -2,12 +2,11 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Lutz Müller <lu...@us...>, 2002.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-25 18:37+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: exif\n"
+"POT-Creation-Date: 2002-06-10 20:19+0200\n"
+"PO-Revision-Date: 2002-09-14 14:40+0200\n"
 "Last-Translator: Lutz Müller <lu...@us...>\n"
 "Language-Team: Deutsch <de...@li...>\n"
 "MIME-Version: 1.0\n"

[libexif-cvs] libexif-gtk autogen.sh,1.3,1.4 configure.in,1.12,1.13

[<as...@us...>]

Update of /cvsroot/libexif/libexif-gtk
In directory usw-pr-cvs1:/tmp/cvs-serv21136

Modified Files:
	autogen.sh configure.in 
Log Message:
- update autogen to match gphoto2's one
- i10n fixes for configure.in


Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- autogen.sh	8 Jul 2002 20:37:23 -0000	1.3
+++ autogen.sh	13 Sep 2002 15:39:26 -0000	1.4
@@ -1,7 +1,26 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 # This was lifted from the Gimp, and adapted slightly by
-# Raph Levien .
+# Raph Levien.
+# Since then, it has been rewritten quite a lot by misc. people.
+
+# Call this file with AUTOCONF_SUFFIX and AUTOMAKE_SUFFIX set
+# if you want us to call a specific version of autoconf or automake. 
+# E.g. if you want us to call automake-1.6 instead of automake (which
+# seems to be quite advisable if your automake is not already version 
+# 1.6) then call this file with AUTOMAKE_SUFFIX set to "-1.6".
+
+# Cases which are known to work:
+# 2002-07-14: Debian GNU/Linux unstable with:
+#   autoconf 2.53
+#   automake 1.4-p5 and 1.6 (both)
+#   gettext  0.10.40
+#   libtool  1.4.2a
+# 2002-07-14: Redhat Linux 7.3 with:
+#   autoconf 2.53
+#   automake 1.5 (not 1.4-p5)
+#   gettext  0.11.1
+#   libtool  1.4.2
 
 DIE=0
 srcdir=`dirname $0`
@@ -10,27 +29,44 @@
 
 PROJECT=libexif-gtk
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+# failure subroutine.
+# syntax: do-something || fail
+fail() {
+    status=$?
+    echo "Last command failed with status $status in directory $(pwd)."
+    echo "Aborting."
+    exit $status
+}
+
+(autoconf${AUTOCONF_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have autoconf installed to compile $PROJECT."
     echo "Download the appropriate package for your distribution,"
-    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/autoconf/"
     DIE=1
 }
 
 (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have libtool installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2.tar.gz"
-    echo "(or a newer version if it is available)"
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/libtool/"
     DIE=1
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(automake${AUTOMAKE_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have automake installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-    echo "(or a newer version if it is available)"
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/automake/"
+    DIE=1
+}
+
+(gettextize --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "You must have gettext installed to compile $PROJECT."
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/gettext/"
     DIE=1
 }
 
@@ -38,32 +74,98 @@
     exit 1
 fi
 
-test -f libexif-gtk/gtk-exif-browser.h || {
-        echo "You must run this script in the top-level libexif-gtk directory"
+test -f libexif-gtk/gtk-exif-entry-version.h || {
+        echo "You must run this script in the top-level $PROJECT directory"
         exit 1
 }
 
-if test -z "$*"; then
-    echo "I am going to run ./configure with no arguments - if you wish "
-    echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-
 case "$CC" in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-libtoolize
-echo "Running aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS"
-aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS
-echo "Running autoheader"
-autoheader
-echo "Running automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt"
-automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt
-echo "Running autoconf"
-autoconf
-echo "Running ./configure"
-./configure $@"
+gettext_version=`gettextize --version 2>&1 | sed -n 's/^.*GNU gettext.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+case $gettext_version in
+0.11.*)
+	gettext_opt="$gettext_opt --intl";;
+esac
+
+# do not change the sequence without understanding the implications
+for dir in .
+do 
+(
+    cd "$dir" || fail
+    echo "Processing ${dir} aka $(pwd)"
+
+    # We explicitly delete files and directories which are not contained 
+    # in the CVS repository and which are generated by the build tools
+    # called here.
+    # This makes changing build tool versions much easier, and removes
+    # the need for any --force parameters to the build tools which may
+    # do something we do want or something we do not.
+
+    echo "Cleaning stuff generated by gettextize"
+    rm -f po/Makevars.template po/Makevars po/Makefile.in.in ABOUT-NLS
+    for file in codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 \
+		lcmessage.m4 progtest.m4
+    do
+	rm -f "m4/$file"
+    done
+    rm -rf intl/
+
+    echo "Running gettextize --copy $gettext_opt"
+    gettextize --copy $gettext_opt || fail
+    if test -f po/Makevars.template
+    then
+	cp po/Makevars.template po/Makevars
+    fi
+
+    case $gettext_version in
+    0.10.*)
+    	grep "intl/Makefile" configure.in ||
+	sed -e 's#^AC_OUTPUT(\[#AC_OUTPUT(\[ intl/Makefile po/Makefile.in#' \
+	configure.in >configure.in.new && mv configure.in.new configure.in
+    esac
+
+    echo "Cleaning stuff generated by libtoolize"
+    rm -f ltmain.sh config.guess config.sub
+
+    echo "Running libtoolize --copy"
+    libtoolize --copy || fail
+
+    echo "Cleaning stuff generated by aclocal"
+    rm -f aclocal.m4
+
+    echo "Running aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS"
+    aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS || fail
+
+    echo "Cleaning stuff generated by autoheader"
+    rm -f config.h.in libgphoto2/config.h.in
+
+    echo "Running autoheader${AUTOCONF_SUFFIX}"
+    autoheader${AUTOCONF_SUFFIX} || fail
+
+    echo "Cleaning stuff generated by automake"
+    find . -name '*.am' -print | 
+	while read file
+	do # remove all .in files with a corresponding .am file
+	    rm -f "$(sed s/\.am$/.in/g)"
+	done
+    rm -f depcomp install-sh missing mkinstalldirs
+    rm -f stamp-h* libgphoto2/stamp-h*
+
+    echo "Running automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt"
+    automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt || fail
+
+    echo "Cleaning stuff generated by autoconf"
+    rm -f configure
+    rm -rf autom4te-*.cache/
+
+    echo "Running autoconf${AUTOCONF_SUFFIX}"
+    autoconf${AUTOCONF_SUFFIX} || fail
+
+    echo "Finished in directory $(pwd)"
+) || fail
+done
 
 echo 
-echo "Now type 'make' to compile $PROJECT."
+echo "$PROJECT is now ready for configuration."

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- configure.in	25 Jul 2002 16:17:11 -0000	1.12
+++ configure.in	13 Sep 2002 15:39:26 -0000	1.13
@@ -46,7 +46,7 @@
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 
-CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Werror"
+CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
 AC_SUBST(CFLAGS)
 
 AC_OUTPUT([
@@ -55,6 +55,4 @@
   libexif-gtk/libexif-gtk.pc
   gtk-extensions/Makefile
   tests/Makefile
-  intl/Makefile
-  po/Makefile.in
 ])

[libexif-cvs] libexif autogen.sh,1.6,1.7

[<as...@us...>]

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv21112

Modified Files:
	autogen.sh 
Log Message:
- update autogen to match gphoto2's one
- i10n fixes for configure.in


Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/libexif/autogen.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- autogen.sh	12 Sep 2002 18:34:20 -0000	1.6
+++ autogen.sh	13 Sep 2002 15:39:06 -0000	1.7
@@ -119,6 +119,13 @@
 	cp po/Makevars.template po/Makevars
     fi
 
+    case $gettext_version in
+    0.10.*)
+    	grep "intl/Makefile" configure.in ||
+	sed -e 's#^AC_OUTPUT(\[#AC_OUTPUT(\[ intl/Makefile po/Makefile.in#' \
+	configure.in >configure.in.new && mv configure.in.new configure.in
+    esac
+
     echo "Cleaning stuff generated by libtoolize"
     rm -f ltmain.sh config.guess config.sub
 

[libexif-cvs] gexif autogen.sh,1.1,1.2 configure.in,1.10,1.11

[<as...@us...>]

Update of /cvsroot/libexif/gexif
In directory usw-pr-cvs1:/tmp/cvs-serv20126

Modified Files:
	autogen.sh configure.in 
Log Message:
- update autogen to match gphoto's one
- i10n fixes in configure.in
- doesn't compile with -Werror


Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/gexif/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- autogen.sh	25 Jan 2002 23:47:41 -0000	1.1
+++ autogen.sh	13 Sep 2002 15:37:16 -0000	1.2
@@ -1,7 +1,26 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 # This was lifted from the Gimp, and adapted slightly by
-# Raph Levien .
+# Raph Levien.
+# Since then, it has been rewritten quite a lot by misc. people.
+
+# Call this file with AUTOCONF_SUFFIX and AUTOMAKE_SUFFIX set
+# if you want us to call a specific version of autoconf or automake. 
+# E.g. if you want us to call automake-1.6 instead of automake (which
+# seems to be quite advisable if your automake is not already version 
+# 1.6) then call this file with AUTOMAKE_SUFFIX set to "-1.6".
+
+# Cases which are known to work:
+# 2002-07-14: Debian GNU/Linux unstable with:
+#   autoconf 2.53
+#   automake 1.4-p5 and 1.6 (both)
+#   gettext  0.10.40
+#   libtool  1.4.2a
+# 2002-07-14: Redhat Linux 7.3 with:
+#   autoconf 2.53
+#   automake 1.5 (not 1.4-p5)
+#   gettext  0.11.1
+#   libtool  1.4.2
 
 DIE=0
 srcdir=`dirname $0`
@@ -10,30 +29,47 @@
 
 PROJECT=gexif
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+# failure subroutine.
+# syntax: do-something || fail
+fail() {
+    status=$?
+    echo "Last command failed with status $status in directory $(pwd)."
+    echo "Aborting."
+    exit $status
+}
+
+(autoconf${AUTOCONF_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have autoconf installed to compile $PROJECT."
     echo "Download the appropriate package for your distribution,"
-    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/autoconf/"
     DIE=1
 }
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+(automake${AUTOMAKE_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "You must have libtool installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2.tar.gz"
-    echo "(or a newer version if it is available)"
+    echo "You must have automake installed to compile $PROJECT."
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/automake/"
     DIE=1
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(gettextize --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "You must have automake installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-    echo "(or a newer version if it is available)"
+    echo "You must have gettext installed to compile $PROJECT."
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/gettext/"
     DIE=1
 }
 
+(pkg-config --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "**Error**: You must have \`pkg-config installed."
+	echo "Download the appropriate package for your distribution,"
+	echo "or get the source tarball at http://www.freedesktop.org/software/pkgconfig/"
+	DIE=1
+}
+
 if test "$DIE" -eq 1; then
     exit 1
 fi
@@ -43,26 +79,87 @@
         exit 1
 }
 
-if test -z "$*"; then
-    echo "I am going to run ./configure with no arguments - if you wish "
-    echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-
 case "$CC" in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-echo "Running aclocal $ACLOCAL_FLAGS"
-aclocal $ACLOCAL_FLAGS
-echo "Running autoheader"
-autoheader
-echo "Running automake --add-missing --gnu $am_opt"
-automake --add-missing --gnu $am_opt
-echo "Running autoconf"
-autoconf
-echo "Running ./configure"
-./configure "$@"
+gettext_version=`gettextize --version 2>&1 | sed -n 's/^.*GNU gettext.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+case $gettext_version in
+0.11.*)
+	gettext_opt="$gettext_opt --intl";;
+esac
+
+# do not change the sequence without understanding the implications
+for dir in .
+do 
+(
+    cd "$dir" || fail
+    echo "Processing ${dir} aka $(pwd)"
+
+    # We explicitly delete files and directories which are not contained 
+    # in the CVS repository and which are generated by the build tools
+    # called here.
+    # This makes changing build tool versions much easier, and removes
+    # the need for any --force parameters to the build tools which may
+    # do something we do want or something we do not.
+
+    echo "Cleaning stuff generated by gettextize"
+    rm -f po/Makevars.template po/Makevars po/Makefile.in.in ABOUT-NLS
+    for file in codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 \
+		lcmessage.m4 progtest.m4
+    do
+	rm -f "m4/$file"
+    done
+    rm -rf intl/
+
+    echo "Running gettextize --copy $gettext_opt"
+    gettextize --copy $gettext_opt || fail
+    if test -f po/Makevars.template
+    then
+	cp po/Makevars.template po/Makevars
+    fi
+
+    case $gettext_version in
+    0.10.*)
+    	grep "intl/Makefile" configure.in ||
+	sed -e 's#^AC_OUTPUT(\[#AC_OUTPUT(\[ intl/Makefile po/Makefile.in#' \
+	configure.in >configure.in.new && mv configure.in.new configure.in
+    esac
+
+    echo "Cleaning stuff generated by aclocal"
+    rm -f aclocal.m4
+
+    echo "Running aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS"
+    aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS || fail
+
+    echo "Cleaning stuff generated by autoheader"
+    rm -f config.h.in libgphoto2/config.h.in
+
+    echo "Running autoheader${AUTOCONF_SUFFIX}"
+    autoheader${AUTOCONF_SUFFIX} || fail
+
+    echo "Cleaning stuff generated by automake"
+    find . -name '*.am' | 
+	while read file
+	do # remove all .in files with a corresponding .am file
+	    rm -f "$(sed s/\.am$/.in/g)"
+	done
+    rm -f depcomp install-sh missing mkinstalldirs
+    rm -f stamp-h* libgphoto2/stamp-h*
+
+    echo "Running automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt"
+    automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt || fail
+
+    echo "Cleaning stuff generated by autoconf"
+    rm -f configure
+    rm -rf autom4te-*.cache/
+
+    echo "Running autoconf${AUTOCONF_SUFFIX}"
+    autoconf${AUTOCONF_SUFFIX} || fail
+
+    echo "Finished in directory $(pwd)"
+) || fail
+done
 
 echo 
-echo "Now type 'make' to compile $PROJECT."
+echo "$PROJECT is now ready for configuration."

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/gexif/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure.in	23 Jul 2002 08:21:12 -0000	1.10
+++ configure.in	13 Sep 2002 15:37:16 -0000	1.11
@@ -26,13 +26,11 @@
 AC_SUBST(GEXIF_LIBS)
 AC_SUBST(GEXIF_CFLAGS)
 
-CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Werror"
+CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
 AC_SUBST(CFLAGS)
 
 AC_OUTPUT([
   Makefile
   libjpeg/Makefile
   gexif/Makefile
-  intl/Makefile
-  po/Makefile.in
 ])

[libexif-cvs] exif autogen.sh,1.3,1.4 configure.in,1.7,1.8

[<as...@us...>]

Update of /cvsroot/libexif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv19606

Modified Files:
	autogen.sh configure.in 
Log Message:
- update autogen to match gphoto's one
- i10n fixes in configure.in


Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/exif/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- autogen.sh	9 Jun 2002 09:14:41 -0000	1.3
+++ autogen.sh	13 Sep 2002 15:35:42 -0000	1.4
@@ -1,7 +1,26 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 # This was lifted from the Gimp, and adapted slightly by
-# Raph Levien .
+# Raph Levien.
+# Since then, it has been rewritten quite a lot by misc. people.
+
+# Call this file with AUTOCONF_SUFFIX and AUTOMAKE_SUFFIX set
+# if you want us to call a specific version of autoconf or automake. 
+# E.g. if you want us to call automake-1.6 instead of automake (which
+# seems to be quite advisable if your automake is not already version 
+# 1.6) then call this file with AUTOMAKE_SUFFIX set to "-1.6".
+
+# Cases which are known to work:
+# 2002-07-14: Debian GNU/Linux unstable with:
+#   autoconf 2.53
+#   automake 1.4-p5 and 1.6 (both)
+#   gettext  0.10.40
+#   libtool  1.4.2a
+# 2002-07-14: Redhat Linux 7.3 with:
+#   autoconf 2.53
+#   automake 1.5 (not 1.4-p5)
+#   gettext  0.11.1
+#   libtool  1.4.2
 
 DIE=0
 srcdir=`dirname $0`
@@ -10,60 +29,137 @@
 
 PROJECT=exif
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+# failure subroutine.
+# syntax: do-something || fail
+fail() {
+    status=$?
+    echo "Last command failed with status $status in directory $(pwd)."
+    echo "Aborting."
+    exit $status
+}
+
+(autoconf${AUTOCONF_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have autoconf installed to compile $PROJECT."
     echo "Download the appropriate package for your distribution,"
-    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/autoconf/"
     DIE=1
 }
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+(automake${AUTOMAKE_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "You must have libtool installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2.tar.gz"
-    echo "(or a newer version if it is available)"
+    echo "You must have automake installed to compile $PROJECT."
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/automake/"
     DIE=1
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(gettextize --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "You must have automake installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-    echo "(or a newer version if it is available)"
+    echo "You must have gettext installed to compile $PROJECT."
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/gettext/"
     DIE=1
 }
 
+(pkg-config --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "**Error**: You must have \`pkg-config installed."
+	echo "Download the appropriate package for your distribution,"
+	echo "or get the source tarball at http://www.freedesktop.org/software/pkgconfig/"
+	DIE=1
+}
+
 if test "$DIE" -eq 1; then
     exit 1
 fi
 
 test -f exif/main.c || {
-        echo "You must run this script in the top-level exif directory"
+        echo "You must run this script in the top-level $PROJECT directory"
         exit 1
 }
 
-if test -z "$*"; then
-    echo "I am going to run ./configure with no arguments - if you wish "
-    echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-
 case "$CC" in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-gettextize
-echo "Running aclocal $ACLOCAL_FLAGS"
-aclocal $ACLOCAL_FLAGS
-echo "Running autoheader"
-autoheader
-echo "Running automake --add-missing --gnu $am_opt"
-automake --add-missing --gnu $am_opt
-echo "Running autoconf"
-autoconf
-echo "Running ./configure"
-./configure "$@"
+gettext_version=`gettextize --version 2>&1 | sed -n 's/^.*GNU gettext.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+case $gettext_version in
+0.11.*)
+	gettext_opt="$gettext_opt --intl";;
+esac
+
+# do not change the sequence without understanding the implications
+for dir in .
+do 
+(
+    cd "$dir" || fail
+    echo "Processing ${dir} aka $(pwd)"
+
+    # We explicitly delete files and directories which are not contained 
+    # in the CVS repository and which are generated by the build tools
+    # called here.
+    # This makes changing build tool versions much easier, and removes
+    # the need for any --force parameters to the build tools which may
+    # do something we do want or something we do not.
+
+    echo "Cleaning stuff generated by gettextize"
+    rm -f po/Makevars.template po/Makevars po/Makefile.in.in ABOUT-NLS
+    for file in codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 \
+		lcmessage.m4 progtest.m4
+    do
+	rm -f "m4/$file"
+    done
+    rm -rf intl/
+
+    echo "Running gettextize --copy $gettext_opt"
+    gettextize --copy $gettext_opt || fail
+    if test -f po/Makevars.template
+    then
+	cp po/Makevars.template po/Makevars
+    fi
+
+    case $gettext_version in
+    0.10.*)
+    	grep "intl/Makefile" configure.in ||
+	sed -e 's#^AC_OUTPUT(\[#AC_OUTPUT(\[ intl/Makefile po/Makefile.in#' \
+	configure.in >configure.in.new && mv configure.in.new configure.in
+    esac
+
+    echo "Cleaning stuff generated by aclocal"
+    rm -f aclocal.m4
+
+    echo "Running aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS"
+    aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS || fail
+
+    echo "Cleaning stuff generated by autoheader"
+    rm -f config.h.in libgphoto2/config.h.in
+
+    echo "Running autoheader${AUTOCONF_SUFFIX}"
+    autoheader${AUTOCONF_SUFFIX} || fail
+
+    echo "Cleaning stuff generated by automake"
+    find . -name '*.am' | 
+	while read file
+	do # remove all .in files with a corresponding .am file
+	    rm -f "$(sed s/\.am$/.in/g)"
+	done
+    rm -f depcomp install-sh missing mkinstalldirs
+    rm -f stamp-h* libgphoto2/stamp-h*
+
+    echo "Running automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt"
+    automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt || fail
+
+    echo "Cleaning stuff generated by autoconf"
+    rm -f configure
+    rm -rf autom4te-*.cache/
+
+    echo "Running autoconf${AUTOCONF_SUFFIX}"
+    autoconf${AUTOCONF_SUFFIX} || fail
+
+    echo "Finished in directory $(pwd)"
+) || fail
+done
 
 echo 
-echo "Now type 'make' to compile $PROJECT."
+echo "$PROJECT is now ready for configuration."

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.in	6 Aug 2002 21:20:44 -0000	1.7
+++ configure.in	13 Sep 2002 15:35:42 -0000	1.8
@@ -32,8 +32,6 @@
   Makefile
   libjpeg/Makefile
   exif/Makefile
-  intl/Makefile
-  po/Makefile.in
 ])
 
 echo "

[libexif-cvs] libexif autogen.sh,1.5,1.6

[<hu...@us...>]

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv13283

Modified Files:
	autogen.sh 
Log Message:
forgot libtoolize

Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/libexif/autogen.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- autogen.sh	12 Sep 2002 17:27:49 -0000	1.5
+++ autogen.sh	12 Sep 2002 18:34:20 -0000	1.6
@@ -46,6 +46,14 @@
     DIE=1
 }
 
+(libtool --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "You must have libtool installed to compile $PROJECT."
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/libtool/"
+    DIE=1
+}
+
 (automake${AUTOMAKE_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have automake installed to compile $PROJECT."
@@ -110,6 +118,12 @@
     then
 	cp po/Makevars.template po/Makevars
     fi
+
+    echo "Cleaning stuff generated by libtoolize"
+    rm -f ltmain.sh config.guess config.sub
+
+    echo "Running libtoolize --copy"
+    libtoolize --copy || fail
 
     echo "Cleaning stuff generated by aclocal"
     rm -f aclocal.m4

[libexif-cvs] libexif configure.in,1.24,1.25

[<hu...@us...>]

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv2517

Modified Files:
	configure.in 
Log Message:
fscking gettext!!!!

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- configure.in	12 Sep 2002 17:20:40 -0000	1.24
+++ configure.in	12 Sep 2002 18:03:42 -0000	1.25
@@ -50,7 +50,6 @@
   libjpeg/Makefile
   test/Makefile
   libexif/libexif.pc
-  po/Makefile.in
 ])
 
 echo "

[libexif-cvs] libexif/po de.po,1.6,1.7

[<hu...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory usw-pr-cvs1:/tmp/cvs-serv30623

Modified Files:
	de.po 
Log Message:
removed default values

Index: de.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/de.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- de.po	12 Sep 2002 17:39:31 -0000	1.6
+++ de.po	12 Sep 2002 17:50:04 -0000	1.7
@@ -5,11 +5,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: libexif vers\n"
 "POT-Creation-Date: 2002-09-12 19:37+0200\n"
-"PO-Revision-Date: 2002-09-12 19:33+0200\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <de...@li...>\n"
+"PO-Revision-Date: 2002-09-12 19:48+0200\n"
+"Last-Translator: Hans Ulrich Niedermann <gp...@n-...>\n"
+"Language-Team: Deutsch <de...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"

[libexif-cvs] libexif/po de.po,1.5,1.6

[<hu...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory usw-pr-cvs1:/tmp/cvs-serv26907

Modified Files:
	de.po 
Log Message:
fixing around

Index: de.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/de.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- de.po	12 Sep 2002 17:34:43 -0000	1.5
+++ de.po	12 Sep 2002 17:39:31 -0000	1.6
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-25 18:32+0200\n"
+"POT-Creation-Date: 2002-09-12 19:37+0200\n"
 "PO-Revision-Date: 2002-09-12 19:33+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <de...@li...>\n"
@@ -612,7 +612,7 @@
 msgid "The kind of light source."
 msgstr "Die Art der Lichtquelle."
 
-#: libexif/exif-entry.c:480 libexif/exif-tag.c:371
+#: libexif/exif-tag.c:371 libexif/exif-entry.c:480
 msgid "Flash"
 msgstr "Blitz"
 

[libexif-cvs] libexif/po de.po,1.4,1.5

[<hu...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory usw-pr-cvs1:/tmp/cvs-serv25339

Modified Files:
	de.po 
Log Message:
corrected missing CHARSET decl

Index: de.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/de.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- de.po	25 Jul 2002 15:52:07 -0000	1.4
+++ de.po	12 Sep 2002 17:34:43 -0000	1.5
@@ -7,11 +7,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2002-07-25 18:32+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2002-09-12 19:33+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <de...@li...>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: libexif/exif-tag.c:53

[libexif-cvs] libexif autogen.sh,1.4,1.5

[<hu...@us...>]

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv23113

Modified Files:
	autogen.sh 
Log Message:
check for correct file

Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/libexif/autogen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- autogen.sh	12 Sep 2002 17:19:28 -0000	1.4
+++ autogen.sh	12 Sep 2002 17:27:49 -0000	1.5
@@ -66,7 +66,7 @@
     exit 1
 fi
 
-test -f src/gtkam-main.h || {
+test -f libexif/exif.c || {
         echo "You must run this script in the top-level $PROJECT directory"
         exit 1
 }

[libexif-cvs] libexif Makefile.am,1.7,1.8 configure.in,1.23,1.24

[<hu...@us...>]

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv20772

Modified Files:
	Makefile.am configure.in 
Log Message:
intl dir is added automatically

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	9 Jun 2002 10:05:40 -0000	1.7
+++ Makefile.am	12 Sep 2002 17:20:40 -0000	1.8
@@ -1,4 +1,5 @@
-SUBDIRS = libexif libjpeg test po intl
+
+SUBDIRS = libexif libjpeg test po
 
 CONFIG_CLEAN_FILES =
 EXTRA_DIST = @PACKAGE@.spec

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- configure.in	29 Aug 2002 21:47:09 -0000	1.23
+++ configure.in	12 Sep 2002 17:20:40 -0000	1.24
@@ -51,7 +51,6 @@
   test/Makefile
   libexif/libexif.pc
   po/Makefile.in
-  intl/Makefile
 ])
 
 echo "

[libexif-cvs] libexif autogen.sh,1.3,1.4

[<hu...@us...>]

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv20405

Modified Files:
	autogen.sh 
Log Message:
stole autogen.sh from gtkam

Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/libexif/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- autogen.sh	8 Jul 2002 20:33:01 -0000	1.3
+++ autogen.sh	12 Sep 2002 17:19:28 -0000	1.4
@@ -1,7 +1,26 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 # This was lifted from the Gimp, and adapted slightly by
-# Raph Levien .
+# Raph Levien.
+# Since then, it has been rewritten quite a lot by misc. people.
+
+# Call this file with AUTOCONF_SUFFIX and AUTOMAKE_SUFFIX set
+# if you want us to call a specific version of autoconf or automake. 
+# E.g. if you want us to call automake-1.6 instead of automake (which
+# seems to be quite advisable if your automake is not already version 
+# 1.6) then call this file with AUTOMAKE_SUFFIX set to "-1.6".
+
+# Cases which are known to work:
+# 2002-07-14: Debian GNU/Linux unstable with:
+#   autoconf 2.53
+#   automake 1.4-p5 and 1.6 (both)
+#   gettext  0.10.40
+#   libtool  1.4.2a
+# 2002-07-14: Redhat Linux 7.3 with:
+#   autoconf 2.53
+#   automake 1.5 (not 1.4-p5)
+#   gettext  0.11.1
+#   libtool  1.4.2
 
 DIE=0
 srcdir=`dirname $0`
@@ -10,27 +29,36 @@
 
 PROJECT=libexif
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+# failure subroutine.
+# syntax: do-something || fail
+fail() {
+    status=$?
+    echo "Last command failed with status $status in directory $(pwd)."
+    echo "Aborting."
+    exit $status
+}
+
+(autoconf${AUTOCONF_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have autoconf installed to compile $PROJECT."
     echo "Download the appropriate package for your distribution,"
-    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/autoconf/"
     DIE=1
 }
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+(automake${AUTOMAKE_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "You must have libtool installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2.tar.gz"
-    echo "(or a newer version if it is available)"
+    echo "You must have automake installed to compile $PROJECT."
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/automake/"
     DIE=1
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(gettextize --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "You must have automake installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-    echo "(or a newer version if it is available)"
+    echo "You must have gettext installed to compile $PROJECT."
+    echo "Download the appropriate package for your distribution,"
+    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/gettext/"
     DIE=1
 }
 
@@ -38,33 +66,85 @@
     exit 1
 fi
 
-test -f libexif/exif.h || {
-        echo "You must run this script in the top-level gphoto2 directory"
+test -f src/gtkam-main.h || {
+        echo "You must run this script in the top-level $PROJECT directory"
         exit 1
 }
 
-if test -z "$*"; then
-    echo "I am going to run ./configure with no arguments - if you wish "
-    echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-
 case "$CC" in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-libtoolize
-gettextize
-echo "Running aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS"
-aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS
-echo "Running autoheader"
-autoheader
-echo "Running automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt"
-automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt
-echo "Running autoconf"
-autoconf
-echo "Running ./configure"
-./configure "$@"
+gettext_version=`gettextize --version 2>&1 | sed -n 's/^.*GNU gettext.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+case $gettext_version in
+0.11.*)
+	gettext_opt="$gettext_opt --intl";;
+esac
 
-echo 
-echo "Now type 'make' to compile $PROJECT."
+# do not change the sequence without understanding the implications
+for dir in .
+do 
+(
+    cd "$dir" || fail
+    echo "Processing ${dir} aka $(pwd)"
+
+    # We explicitly delete files and directories which are not contained 
+    # in the CVS repository and which are generated by the build tools
+    # called here.
+    # This makes changing build tool versions much easier, and removes
+    # the need for any --force parameters to the build tools which may
+    # do something we do want or something we do not.
+
+    echo "Cleaning stuff generated by gettextize"
+    rm -f po/Makevars.template po/Makevars po/Makefile.in.in ABOUT-NLS
+    for file in codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 \
+		lcmessage.m4 progtest.m4
+    do
+	rm -f "m4/$file"
+    done
+    rm -rf intl/
+
+    echo "Running gettextize --copy $gettext_opt"
+    gettextize --copy $gettext_opt || fail
+    if test -f po/Makevars.template
+    then
+	cp po/Makevars.template po/Makevars
+    fi
+
+    echo "Cleaning stuff generated by aclocal"
+    rm -f aclocal.m4
+
+    echo "Running aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS"
+    aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS || fail
+
+    echo "Cleaning stuff generated by autoheader"
+    rm -f config.h.in libgphoto2/config.h.in
+
+    echo "Running autoheader${AUTOCONF_SUFFIX}"
+    autoheader${AUTOCONF_SUFFIX} || fail
+
+    echo "Cleaning stuff generated by automake"
+    find . -name '*.am' | 
+	while read file
+	do # remove all .in files with a corresponding .am file
+	    rm -f "$(sed s/\.am$/.in/g)"
+	done
+    rm -f depcomp install-sh missing mkinstalldirs
+    rm -f stamp-h* libgphoto2/stamp-h*
+
+    echo "Running automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt"
+    automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt || fail
+
+    echo "Cleaning stuff generated by autoconf"
+    rm -f configure
+    rm -rf autom4te-*.cache/
+
+    echo "Running autoconf${AUTOCONF_SUFFIX}"
+    autoconf${AUTOCONF_SUFFIX} || fail
+
+    echo "Finished in directory $(pwd)"
+) || fail
+done
+
+echo
+echo "$PROJECT is now ready for configuration."

[libexif-cvs] exif ChangeLog,1.11,1.12

[<lu...@us...>]

Update of /cvsroot/libexif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv21558

Modified Files:
	ChangeLog 
Log Message:

2002-08-30  Lutz Müller <lu...@us...>

	* exif/main.c: Make sure people don't try too save too much EXIF data.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	6 Aug 2002 21:20:44 -0000	1.11
+++ ChangeLog	30 Aug 2002 07:05:48 -0000	1.12
@@ -1,3 +1,7 @@
+2002-08-30  Lutz Müller <lu...@us...>
+
+	* exif/main.c: Make sure people don't try too save too much EXIF data.
+
 2002-08-06  Lutz Müller <lu...@us...>
 
 	* configure.in: Check for locale.h

[libexif-cvs] exif/exif main.c,1.19,1.20

[<lu...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv21558/exif

Modified Files:
	main.c 
Log Message:

2002-08-30  Lutz Müller <lu...@us...>

	* exif/main.c: Make sure people don't try too save too much EXIF data.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- main.c	6 Aug 2002 21:20:45 -0000	1.19
+++ main.c	30 Aug 2002 07:05:49 -0000	1.20
@@ -145,6 +145,8 @@
 save_exif_data_to_file (ExifData *ed, const char *fname, const char *target)
 {
 	JPEGData *jdata;
+	unsigned char *d = NULL;
+	unsigned int ds;
 
 	/* Parse the JPEG file */
 	jdata = jpeg_data_new_from_file (fname);
@@ -154,6 +156,18 @@
 		fprintf (stderr, "\n");
 		return (1);
 	}
+
+	/* Make sure the EXIF data is not too big. */
+	exif_data_save_data (ed, &d, &ds);
+	if (ds) {
+		if (ds > 0xffff) {
+			fprintf (stderr, _("Too much EXIF data (%i bytes). "
+				"Only %i bytes are allowed."), ds, 0xffff);
+			fprintf (stderr, "\n");
+			return (1);
+		}
+		free (d);
+	};
 
 	jpeg_data_set_exif_data (jdata, ed);
 

[libexif-cvs] libexif ChangeLog,1.42,1.43

[<lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv21498

Modified Files:
	ChangeLog 
Log Message:

2002-08-30  Lutz Müller <lu...@us...>

	* libexif/exif-data.c: Some cleanup.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ChangeLog	29 Aug 2002 21:47:09 -0000	1.42
+++ ChangeLog	30 Aug 2002 07:05:42 -0000	1.43
@@ -1,3 +1,7 @@
+2002-08-30  Lutz Müller <lu...@us...>
+
+	* libexif/exif-data.c: Some cleanup.
+
 2002-08-29  Lutz Müller <lu...@us...>
 
 	Renchi Raju <re...@po...> found another bug in 

[libexif-cvs] libexif/libexif exif-data.c,1.20,1.21

[<lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv21498/libexif

Modified Files:
	exif-data.c 
Log Message:

2002-08-30  Lutz Müller <lu...@us...>

	* libexif/exif-data.c: Some cleanup.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- exif-data.c	29 Aug 2002 21:47:53 -0000	1.20
+++ exif-data.c	30 Aug 2002 07:05:43 -0000	1.21
@@ -256,28 +256,46 @@
 			     unsigned char **d, unsigned int *ds,
 			     unsigned int offset)
 {
-	unsigned int i, n_ptr = 0, n_thumb = 0;
+	unsigned int j, n_ptr = 0, n_thumb = 0;
+	ExifIfd i;
+
+	if (!data || !ifd || !d || !ds)
+		return;
+
+	for (i = 0; i < EXIF_IFD_COUNT; i++)
+		if (ifd == data->ifd[i])
+			break;
+	if (i == EXIF_IFD_COUNT)
+		return;
 
 	/*
 	 * Check if we need some extra entries for pointers or the thumbnail.
 	 */
-	if (ifd == data->ifd[EXIF_IFD_0]) {
+	switch (i) {
+	case EXIF_IFD_0:
 
 		/*
 		 * The pointer to IFD_EXIF is in IFD_0. The pointer to
 		 * IFD_INTEROPERABILITY is in IFD_EXIF.
 		 */
-		if (data->ifd[EXIF_IFD_EXIF]->count || data->ifd[EXIF_IFD_INTEROPERABILITY]->count)
+		if (data->ifd[EXIF_IFD_EXIF]->count ||
+		    data->ifd[EXIF_IFD_INTEROPERABILITY]->count)
 			n_ptr++;
 
 		/* The pointer to IFD_GPS is in IFD_0. */
 		if (data->ifd[EXIF_IFD_GPS]->count)
 			n_ptr++;
-	} else if ((ifd == data->ifd[EXIF_IFD_1]) && data->size) {
-		n_thumb = 2;
-	} else if (ifd == data->ifd[EXIF_IFD_EXIF]) {
+
+		break;
+	case EXIF_IFD_1:
+		if (data->size)
+			n_thumb = 2;
+		break;
+	case EXIF_IFD_EXIF:
 		if (data->ifd[EXIF_IFD_INTEROPERABILITY]->count)
 			n_ptr++;
+	default:
+		break;
 	}
 
 	/*
@@ -291,93 +309,127 @@
 	exif_set_short (*d + 6 + offset, data->priv->order,
 			ifd->count + n_ptr + n_thumb);
 	offset += 2;
+
 #ifdef DEBUG
-	printf ("Saving %i entries (offset: %i)...\n", ifd->count, offset);
+	printf ("Saving %i entries (IFD '%s', offset: %i)...\n",
+		ifd->count, exif_ifd_get_name (i), offset);
 #endif
 
 	/* Save each entry */
-	for (i = 0; i < ifd->count; i++)
-		exif_data_save_data_entry (data, ifd->entries[i],
-				d, ds, offset + 12 * i);
+	for (j = 0; j < ifd->count; j++)
+		exif_data_save_data_entry (data, ifd->entries[j],
+				d, ds, offset + 12 * j);
 	offset += 12 * ifd->count;
 
-	/*
-	 * The pointer to IFD_EXIF is in IFD_0.
-	 * However, the pointer to IFD_INTEROPERABILITY is in IFD_EXIF,
-	 * therefore, if IFD_INTEROPERABILITY is not empty, we need
-	 * IFD_EXIF even if latter is empty.
-	 */
-	if (ifd == data->ifd[EXIF_IFD_0] && (
-			data->ifd[EXIF_IFD_EXIF]->count ||
-			data->ifd[EXIF_IFD_INTEROPERABILITY]->count)) {
-		exif_set_short (*d + 6 + offset + 0, data->priv->order,
-				EXIF_TAG_EXIF_IFD_POINTER);
-		exif_set_short (*d + 6 + offset + 2, data->priv->order,
-				EXIF_FORMAT_LONG);
-		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
-		exif_set_long  (*d + 6 + offset + 8, data->priv->order,
-				*ds - 6);
-		exif_data_save_data_content (data, data->ifd[EXIF_IFD_EXIF], d,
-					     ds, *ds - 6);
-		offset += 12;
-	}
+	/* Now save special entries. */
+	switch (i) {
+	case EXIF_IFD_0:
 
-	/* The pointer to IFD_GPS is in IFD_0. */
-	if (ifd == data->ifd[EXIF_IFD_0] && data->ifd[EXIF_IFD_GPS]->count) {
-		exif_set_short (*d + 6 + offset + 0, data->priv->order,
-				EXIF_TAG_GPS_INFO_IFD_POINTER);
-		exif_set_short (*d + 6 + offset + 2, data->priv->order,
-				EXIF_FORMAT_LONG);
-		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
-		exif_set_long  (*d + 6 + offset + 8, data->priv->order,
-				*ds - 6);
-		exif_data_save_data_content (data, data->ifd[EXIF_IFD_GPS], d, ds,
-					     *ds - 6);
-		offset += 12;
-	}
+		/*
+		 * The pointer to IFD_EXIF is in IFD_0.
+		 * However, the pointer to IFD_INTEROPERABILITY is in IFD_EXIF,
+		 * therefore, if IFD_INTEROPERABILITY is not empty, we need
+		 * IFD_EXIF even if latter is empty.
+		 */
+		if (data->ifd[EXIF_IFD_EXIF]->count ||
+		    data->ifd[EXIF_IFD_INTEROPERABILITY]->count) {
+			exif_set_short (*d + 6 + offset + 0, data->priv->order,
+					EXIF_TAG_EXIF_IFD_POINTER);
+			exif_set_short (*d + 6 + offset + 2, data->priv->order,
+					EXIF_FORMAT_LONG);
+			exif_set_long  (*d + 6 + offset + 4, data->priv->order,
+					1);
+			exif_set_long  (*d + 6 + offset + 8, data->priv->order,
+					*ds - 6);
+			exif_data_save_data_content (data,
+				data->ifd[EXIF_IFD_EXIF], d, ds, *ds - 6);
+			offset += 12;
+		}
 
-	/* The pointer to IFD_INTEROPERABILITY is in IFD_EXIF. See above. */
-	if (ifd == data->ifd[EXIF_IFD_EXIF] && data->ifd[EXIF_IFD_INTEROPERABILITY]->count) {
-		exif_set_short (*d + 6 + offset + 0, data->priv->order,
-				EXIF_TAG_INTEROPERABILITY_IFD_POINTER);
-		exif_set_short (*d + 6 + offset + 2, data->priv->order,
-				EXIF_FORMAT_LONG);
-		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
-		exif_set_long  (*d + 6 + offset + 8, data->priv->order,
-				*ds - 6);
-		exif_data_save_data_content (data, data->ifd[EXIF_IFD_INTEROPERABILITY],
-					     d, ds, *ds - 6);
-		offset += 12;
-	}
+		/* The pointer to IFD_GPS is in IFD_0, too. */
+		if (data->ifd[EXIF_IFD_GPS]->count) {
+			exif_set_short (*d + 6 + offset + 0, data->priv->order,
+					EXIF_TAG_GPS_INFO_IFD_POINTER);
+			exif_set_short (*d + 6 + offset + 2, data->priv->order,
+					EXIF_FORMAT_LONG);
+			exif_set_long  (*d + 6 + offset + 4, data->priv->order,
+					1);
+			exif_set_long  (*d + 6 + offset + 8, data->priv->order,
+					*ds - 6);
+			exif_data_save_data_content (data,
+				data->ifd[EXIF_IFD_GPS], d, ds, *ds - 6);
+			offset += 12;
+		}
 
-	/* Information about the thumbnail (if any) is saved in IFD_1. */
-	if ((ifd == data->ifd[EXIF_IFD_1]) && data->size) {
+		break;
+	case EXIF_IFD_EXIF:
 
-		/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT */
-		exif_set_short (*d + 6 + offset + 0, data->priv->order,
-				EXIF_TAG_JPEG_INTERCHANGE_FORMAT);
-		exif_set_short (*d + 6 + offset + 2, data->priv->order,
-				EXIF_FORMAT_LONG);
-		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
-		exif_set_long  (*d + 6 + offset + 8, data->priv->order,
+		/*
+		 * The pointer to IFD_INTEROPERABILITY is in IFD_EXIF.
+		 * See note above.
+		 */
+		if (data->ifd[EXIF_IFD_INTEROPERABILITY]->count) {
+			exif_set_short (*d + 6 + offset + 0, data->priv->order,
+					EXIF_TAG_INTEROPERABILITY_IFD_POINTER);
+			exif_set_short (*d + 6 + offset + 2, data->priv->order,
+					EXIF_FORMAT_LONG);
+			exif_set_long  (*d + 6 + offset + 4, data->priv->order,
+					1);
+			exif_set_long  (*d + 6 + offset + 8, data->priv->order,
+					*ds - 6);
+			exif_data_save_data_content (data,
+				data->ifd[EXIF_IFD_INTEROPERABILITY], d, ds,
 				*ds - 6);
-		*ds += data->size;
-		*d = realloc (*d, sizeof (char) * *ds);
-		memcpy (*d + *ds - data->size, data->data, data->size);
-		offset += 12;
+			offset += 12;
+		}
 
-		/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH */
-		exif_set_short (*d + 6 + offset + 0, data->priv->order,
+		break;
+	case EXIF_IFD_1:
+
+		/*
+		 * Information about the thumbnail (if any) is saved in
+		 * IFD_1.
+		 */
+		if (data->size) {
+
+			/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT */
+			exif_set_short (*d + 6 + offset + 0, data->priv->order,
+					EXIF_TAG_JPEG_INTERCHANGE_FORMAT);
+			exif_set_short (*d + 6 + offset + 2, data->priv->order,
+					EXIF_FORMAT_LONG);
+			exif_set_long  (*d + 6 + offset + 4, data->priv->order,
+					1);
+			exif_set_long  (*d + 6 + offset + 8, data->priv->order,
+					*ds - 6);
+			*ds += data->size;
+			*d = realloc (*d, sizeof (char) * *ds);
+			memcpy (*d + *ds - data->size, data->data, data->size);
+			offset += 12;
+#ifdef DEBUG
+			printf ("Wrote %i bytes of thumbnail data at offset "
+				"%i.\n", data->size, *ds - data->size);
+			printf ("We currently have %i bytes EXIF data.\n", *ds);
+#endif
+
+			/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH */
+			exif_set_short (*d + 6 + offset + 0, data->priv->order,
 				EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
-		exif_set_short (*d + 6 + offset + 2, data->priv->order,
-				EXIF_FORMAT_LONG);
-		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
-		exif_set_long  (*d + 6 + offset + 8, data->priv->order, 
-				data->size);
-		offset += 12;
+			exif_set_short (*d + 6 + offset + 2, data->priv->order,
+					EXIF_FORMAT_LONG);
+			exif_set_long  (*d + 6 + offset + 4, data->priv->order,
+					1);
+			exif_set_long  (*d + 6 + offset + 8, data->priv->order, 
+					data->size);
+			offset += 12;
+		}
+
+		break;
+	default:
+		break;
 	}
 
-	if (ifd == data->ifd[EXIF_IFD_0] && (data->ifd[EXIF_IFD_1]->count ||
+	/* Correctly terminate the directory */
+	if (i == EXIF_IFD_0 && (data->ifd[EXIF_IFD_1]->count ||
 					     data->size)) {
 
 		/*
@@ -584,7 +636,8 @@
 #ifdef DEBUG
 	printf ("Saving IFDs...\n");
 #endif
-	exif_data_save_data_content (data, data->ifd[EXIF_IFD_0], d, ds, *ds - 6);
+	exif_data_save_data_content (data, data->ifd[EXIF_IFD_0], d, ds,
+				     *ds - 6);
 
 #ifdef DEBUG
 	printf ("Saved %i byte(s) EXIF data.\n", *ds);

[libexif-cvs] libexif/libexif exif-data.c,1.19,1.20

[<lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv18638/libexif

Modified Files:
	exif-data.c 
Log Message:



Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- exif-data.c	29 Aug 2002 21:47:09 -0000	1.19
+++ exif-data.c	29 Aug 2002 21:47:53 -0000	1.20
@@ -32,7 +32,7 @@
 #undef MAX
 #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
 
-#define DEBUG
+//#define DEBUG
 
 static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};