--- ./exif/main.c	Sat Dec 28 11:47:57 2002
+++ ../exif-0.6/./exif/main.c	Wed Feb 19 13:08:11 2003
@@ -147,7 +147,7 @@
 
 typedef struct _ExifOptions ExifOptions;
 struct _ExifOptions {
-	unsigned char use_ids;
+	unsigned int use_ids;
 	ExifTag tag;
 #ifdef HAVE_MNOTE
 	MNoteTag ntag;
@@ -154,31 +154,33 @@
 #endif
 };
 
-int
-main (int argc, const char **argv)
-{
-	/* POPT_ARG_NONE needs an int, not char! */
-	unsigned int list_tags = 0, show_description = 0;
+static unsigned int list_tags = 0, show_description = 0;
 #ifdef HAVE_MNOTE
-	unsigned int list_ntags = 0;
+static unsigned int list_ntags = 0;
 #endif
-	unsigned int extract_thumbnail = 0, remove_thumbnail = 0;
-	unsigned int remove = 0;
-	const char *set_value = NULL, *ifd_string = NULL, *tag_string = NULL;
+static unsigned int extract_thumbnail = 0, remove_thumbnail = 0;
+static unsigned int remove_tag = 0;
+static const char *set_value = NULL, *ifd_string = NULL, *tag_string = NULL;
 #ifdef HAVE_MNOTE
-	const char *ntag_string = NULL;
+static const char *ntag_string = NULL;
 #endif
-	ExifIfd ifd = -1;
-	ExifTag tag = 0;
+static ExifIfd ifd = -1;
+static ExifTag tag = 0;
 #ifdef HAVE_MNOTE
-	MNoteTag ntag = 0;
-	ExifOptions eo = {0, 0, 0};
+static MNoteTag ntag = 0;
+static ExifOptions eo = {0, 0, 0};
 #else
-	ExifOptions eo = {0, 0};
+static ExifOptions eo = {0, 0};
 #endif
+static const char *output = NULL;
+static const char *ithumbnail = NULL;
+
+int
+main (int argc, const char **argv)
+{
+	/* POPT_ARG_NONE needs an int, not char! */
 	poptContext ctx;
-	const char **args, *output = NULL;
-	const char *ithumbnail = NULL;
+	const char **args;
 	struct poptOption options[] = {
 		POPT_AUTOHELP
 		{"ids", 'i', POPT_ARG_NONE, &eo.use_ids, 0,
@@ -197,7 +199,7 @@
 		{"list-ntags", '\0', POPT_ARG_NONE, &list_ntags, 0,
 		 N_("List all EXIF MakerNote tags"), NULL},
 #endif
-		{"remove", '\0', POPT_ARG_NONE, &remove, 0,
+		{"remove", '\0', POPT_ARG_NONE, &remove_tag, 0,
 		 N_("Remove tag or ifd"), NULL},
 		{"show-description", 's', POPT_ARG_NONE, &show_description, 0,
 		 N_("Show description of tag"), NULL},
@@ -591,7 +593,7 @@
 	}
 }
 				save_exif_data_to_file (ed, *args, fname);
-			} else if (remove) {
+			} else if (remove_tag) {
 				
 				/* We need an IFD. */
 				if ((ifd < EXIF_IFD_0) ||
--- ./exif/Makefile.in	Tue Jan  7 12:59:47 2003
+++ ../exif-0.6/./exif/Makefile.in	Wed Feb 19 13:20:57 2003
@@ -130,7 +130,7 @@
 	utils.h utils.c
 
 exif_LDADD = \
-	../libjpeg/libjpeg.la			\
+	../libjpeg/libjpeg.a			\
 	$(LIBEXIF_LIBS) $(LIBMNOTE_LIBS)	\
 	$(POPT_LIBS)				\
 	$(INTLLIBS)
@@ -144,7 +144,7 @@
 
 am_exif_OBJECTS = actions.$(OBJEXT) main.$(OBJEXT) utils.$(OBJEXT)
 exif_OBJECTS = $(am_exif_OBJECTS)
-exif_DEPENDENCIES = ../libjpeg/libjpeg.la
+exif_DEPENDENCIES = ../libjpeg/libjpeg.a
 exif_LDFLAGS =
 
 DEFS = @DEFS@
--- ./libjpeg/Makefile.in	Tue Jan  7 12:59:47 2003
+++ ../exif-0.6/./libjpeg/Makefile.in	Wed Feb 19 13:21:49 2003
@@ -119,12 +119,12 @@
 	$(LIBEXIF_CFLAGS)
 
 
-noinst_LTLIBRARIES = libjpeg.la
+noinst_LTLIBRARIES = libjpeg.a
 libjpeg_la_SOURCES = \
 	jpeg-data.c jpeg-data.h		\
 	jpeg-marker.c jpeg-marker.h
 
-libjpeg_la_LIBADD = $(LIBEXIF_LIBS)
+libjpeg_la_LIBADD = $(LIBEXIF_LIBS) -static
 subdir = libjpeg
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -174,7 +174,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libjpeg.la: $(libjpeg_la_OBJECTS) $(libjpeg_la_DEPENDENCIES) 
+libjpeg.a: $(libjpeg_la_OBJECTS) $(libjpeg_la_DEPENDENCIES) 
 	$(LINK)  $(libjpeg_la_LDFLAGS) $(libjpeg_la_OBJECTS) $(libjpeg_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
--- ./ltmain.sh	Thu Dec 12 13:00:58 2002
+++ ../exif-0.6/./ltmain.sh	Wed Feb 19 13:08:54 2003
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"