Use libtool for linking

2008-06-24 00:47:35 +02:00 · 2008-06-24 00:47:35 +02:00 · 0b2c87dee6
commit 0b2c87dee6
parent 62c3d8b8dc
10 changed files with 33507 additions and 177 deletions
--- a/.hgignore
+++ b/.hgignore
@ -1,6 +1,8 @@

 syntax: regexp
 ^\.deps/
+^\.libs/
+^autom4te.cache/
 ^\.project$
 ^\.cproject$
 ^levels/level.lvl$
@ -12,3 +14,5 @@ syntax: regexp
 ^zoom$
 \.o$
 ^zoom-bin$
+^libtool$
+~$
--- a/Makefile.am
+++ b/Makefile.am
@ -6,8 +6,6 @@ nobase_game_DATA     = levels/level.dtd levels/level.lvl tex/*
 nobase_game_PROGRAMS = zoom-bin

 zoom_bin_SOURCES     = zoom-bin.c
-zoom_bin_CFLAGS      = @libzoom_CFLAGS@
-zoom_bin_LDADD       = @libzoom_LIBS@

 EXTRA_DIST           = levels/level.dtd levels/*.xml tex/*
 CLEANFILES           = levels/*.lvl
--- a/Makefile.in
+++ b/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -32,14 +32,17 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 nobase_game_PROGRAMS = zoom-bin$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in $(srcdir)/zoom.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile depcomp install-sh missing mkinstalldirs
+	compile config.guess config.sub depcomp install-sh ltmain.sh \
+	missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@ -51,11 +54,9 @@ am__installdirs = "$(DESTDIR)$(gamedir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(gamedir)"
 nobase_gamePROGRAMS_INSTALL = $(install_sh_PROGRAM)
 PROGRAMS = $(nobase_game_PROGRAMS)
-am_zoom_bin_OBJECTS = zoom_bin-zoom-bin.$(OBJEXT)
+am_zoom_bin_OBJECTS = zoom-bin.$(OBJEXT)
 zoom_bin_OBJECTS = $(am_zoom_bin_OBJECTS)
-zoom_bin_DEPENDENCIES =
-zoom_bin_LINK = $(CCLD) $(zoom_bin_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+zoom_bin_LDADD = $(LDADD)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
@ -63,8 +64,13 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(zoom_bin_SOURCES)
 DIST_SOURCES = $(zoom_bin_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@ -90,6 +96,7 @@ distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@ -97,14 +104,25 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -113,10 +131,13 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -126,6 +147,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@ -135,20 +158,30 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@ -177,15 +210,13 @@ gamedir = ${prefix}/games/zoom
 bin_SCRIPTS = zoom
 nobase_game_DATA = levels/level.dtd levels/level.lvl tex/*
 zoom_bin_SOURCES = zoom-bin.c
-zoom_bin_CFLAGS = @libzoom_CFLAGS@
-zoom_bin_LDADD = @libzoom_LIBS@
 EXTRA_DIST = levels/level.dtd levels/*.xml tex/*
 CLEANFILES = levels/*.lvl
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am

 .SUFFIXES:
-.SUFFIXES: .c .lvl .o .obj .xml
+.SUFFIXES: .c .lo .lvl .o .obj .xml
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@ -244,11 +275,12 @@ install-nobase_gamePROGRAMS: $(nobase_game_PROGRAMS)
 	@list='$(nobase_game_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
+	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 	    f=`echo "$$p1" | sed 's|[^/]*$$||'`"$$f"; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(nobase_gamePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(gamedir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(nobase_gamePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(gamedir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(nobase_gamePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(gamedir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(nobase_gamePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(gamedir)/$$f" || exit 1; \
 	  else :; fi; \
 	done

@ -262,10 +294,14 @@ uninstall-nobase_gamePROGRAMS:
 	done

 clean-nobase_gamePROGRAMS:
-	-test -z "$(nobase_game_PROGRAMS)" || rm -f $(nobase_game_PROGRAMS)
+	@list='$(nobase_game_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
 zoom-bin$(EXEEXT): $(zoom_bin_OBJECTS) $(zoom_bin_DEPENDENCIES) 
 	@rm -f zoom-bin$(EXEEXT)
-	$(zoom_bin_LINK) $(zoom_bin_OBJECTS) $(zoom_bin_LDADD) $(LIBS)
+	$(LINK) $(zoom_bin_OBJECTS) $(zoom_bin_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@ -292,7 +328,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoom_bin-zoom-bin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoom-bin.Po@am__quote@

 .c.o:
@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@ -308,19 +344,21 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`

-zoom_bin-zoom-bin.o: zoom-bin.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -MT zoom_bin-zoom-bin.o -MD -MP -MF $(DEPDIR)/zoom_bin-zoom-bin.Tpo -c -o zoom_bin-zoom-bin.o `test -f 'zoom-bin.c' || echo '$(srcdir)/'`zoom-bin.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/zoom_bin-zoom-bin.Tpo $(DEPDIR)/zoom_bin-zoom-bin.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zoom-bin.c' object='zoom_bin-zoom-bin.o' libtool=no @AMDEPBACKSLASH@
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -c -o zoom_bin-zoom-bin.o `test -f 'zoom-bin.c' || echo '$(srcdir)/'`zoom-bin.c
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

-zoom_bin-zoom-bin.obj: zoom-bin.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -MT zoom_bin-zoom-bin.obj -MD -MP -MF $(DEPDIR)/zoom_bin-zoom-bin.Tpo -c -o zoom_bin-zoom-bin.obj `if test -f 'zoom-bin.c'; then $(CYGPATH_W) 'zoom-bin.c'; else $(CYGPATH_W) '$(srcdir)/zoom-bin.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/zoom_bin-zoom-bin.Tpo $(DEPDIR)/zoom_bin-zoom-bin.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zoom-bin.c' object='zoom_bin-zoom-bin.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zoom_bin_CFLAGS) $(CFLAGS) -c -o zoom_bin-zoom-bin.obj `if test -f 'zoom-bin.c'; then $(CYGPATH_W) 'zoom-bin.c'; else $(CYGPATH_W) '$(srcdir)/zoom-bin.c'; fi`
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
 install-nobase_gameDATA: $(nobase_game_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(gamedir)" || $(MKDIR_P) "$(DESTDIR)$(gamedir)"
@ -346,8 +384,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

@ -359,8 +397,8 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@ -370,13 +408,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@ -430,6 +467,10 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)

+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@ -456,6 +497,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@ -548,14 +591,15 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am

-clean-am: clean-generic clean-nobase_gamePROGRAMS mostlyclean-am
+clean-am: clean-generic clean-libtool clean-nobase_gamePROGRAMS \
+	mostlyclean-am

 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
+	distclean-hdr distclean-libtool distclean-tags

 dvi: dvi-am

@ -594,7 +638,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic

 mostlyclean: mostlyclean-am

-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool

 pdf: pdf-am

@ -610,9 +655,10 @@ uninstall-am: uninstall-binSCRIPTS uninstall-nobase_gameDATA \
 .MAKE: install-am install-strip

 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-nobase_gamePROGRAMS ctags dist dist-all \
-	dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
+	clean-generic clean-libtool clean-nobase_gamePROGRAMS ctags \
+	dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \
+	dist-tarZ dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binSCRIPTS install-data install-data-am install-dvi \
@ -622,9 +668,10 @@ uninstall-am: uninstall-binSCRIPTS uninstall-nobase_gameDATA \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binSCRIPTS \
-	uninstall-nobase_gameDATA uninstall-nobase_gamePROGRAMS
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binSCRIPTS uninstall-nobase_gameDATA \
+	uninstall-nobase_gamePROGRAMS


 .xml.lvl:
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/config.guess
+++ b/config.guess
--- a/config.h.in
+++ b/config.h.in
@ -1,7 +1,34 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */

-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H

 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
@ -24,6 +51,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME

--- a/config.sub
+++ b/config.sub
--- a/16703
+++ b/16703
--- a/configure.ac
+++ b/configure.ac
@ -11,19 +11,23 @@ AM_MAINTAINER_MODE

 # Checks for programs.
 AC_PROG_CC
+AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG

 # Checks for libraries.
 PKG_CHECK_MODULES(libzoom, libzoom-0.1, , AC_MSG_ERROR(Test for libzoom failed.))

+CFLAGS="$libzoom_CFLAGS $CFLAGS"
+LIBS="$libzoom_LIBS $LIBS"
+
 # Checks for header files.

 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_TIME

 # Checks for library functions.
-AC_CHECK_FUNCS([gettimeofday])
+#AC_CHECK_FUNCS([gettimeofday])

 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT([zoom])
--- a/ltmain.sh
+++ b/ltmain.sh