diff -Naurp imlib-1.9.14/Imlib/Makefile.in imlib-1.9.14-cygwin/Imlib/Makefile.in --- imlib-1.9.14/Imlib/Makefile.in Mon Mar 25 16:50:26 2002 +++ imlib-1.9.14-cygwin/Imlib/Makefile.in Wed Mar 27 12:41:53 2002 @@ -138,7 +138,7 @@ LIBS = @LIBS@ libImlib_la_DEPENDENCIES = libImlib_la_OBJECTS = cache.lo colors.lo load.lo misc.lo rend.lo \ utils.lo save.lo snprintf.lo -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ $(DLL_CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -183,6 +183,9 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + echo "install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll"; \ + install -D --mode=755 .libs/$$dll $(DESTDIR)$(bindir)/$$dll; \ else :; fi; \ done @@ -190,6 +193,8 @@ uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) list='$(lib_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + dll=$$(echo $$p | sed 's,^lib\(.*\).la$$,cyg\1.dll,'); \ + rm -f $(DESTDIR)$(bindir)/$$dll; \ done .c.o: @@ -238,6 +243,7 @@ maintainer-clean-libtool: libImlib.la: $(libImlib_la_OBJECTS) $(libImlib_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libImlib_la_LDFLAGS) $(libImlib_la_OBJECTS) $(libImlib_la_LIBADD) $(LIBS) + cd .libs && PREFIX=$(prefix) sh ../../mkdll.sh $@ $(libImlib_la_LIBADD) $(LIBS) $$(gtk-config --libs) install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) diff -Naurp imlib-1.9.14/config.h.in imlib-1.9.14-cygwin/config.h.in --- imlib-1.9.14/config.h.in Mon Mar 25 16:45:32 2002 +++ imlib-1.9.14-cygwin/config.h.in Wed Mar 27 13:47:56 2002 @@ -24,6 +24,7 @@ #undef HAVE_STDARGS #undef USE_GMODULE +#define USE_GMODULE 1 /* Define if you have the basename function. */ #undef HAVE_BASENAME diff -Naurp imlib-1.9.14/configure imlib-1.9.14-cygwin/configure --- imlib-1.9.14/configure Mon Mar 25 16:45:33 2002 +++ imlib-1.9.14-cygwin/configure Wed Mar 27 13:39:29 2002 @@ -3097,7 +3097,8 @@ EOF else $CC -o impgen impgen.c ; fi)~ $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' - old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' +# old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' +old_archive_from_expsyms_cmds= # cygwin and mingw dlls have different entry points and sets of symbols # to exclude. @@ -4947,7 +4948,8 @@ old_postuninstall_cmds=$lt_old_postunins old_archive_from_new_cmds=$lt_old_archive_from_new_cmds # Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +#old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +old_archive_from_expsyms_cmds= # Commands used to build and install a shared archive. archive_cmds=$lt_archive_cmds @@ -7359,7 +7361,7 @@ fi if test -z "$GDK_IMLIB"; then # see macros/gnome-x-checks.m4, and gtk.m4 CPPFLAGS="$CPPFLAGS $X_CFLAGS" - GX_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lm" + GX_LIBS="$X_PRE_LIBS $X_LIBS -lX11" else CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" GX_LIBS="$GTK_LIBS" @@ -7973,7 +7975,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lpng -lz -lm $GX_LIBS $LIBS" +LIBS="-lpng -lz $GX_LIBS $LIBS" cat > conftest.$ac_ext < +# eg: +# mkdll.sh libtest.la -L/usr/local/lib -llocal + +# defaults to using gcc for libraries written in C. +# set the CC env var to use a different compiler driver: eg +# export CC=g++ +# for C++ libraries + +# defaults to using /usr/local as the installation PREFIX +# override this by setting the PREFIX env var: eg +# export PREFIX=/opt/gnome + +archive=$1 +module=$(echo $(basename $archive) | sed -e 's,^lib\(.*\).la$,\1,') + +shift +dependency_libs="$@" + +test -n "$CC" || CC=gcc +test -n "$PREFIX" || prefix=/usr/local + +# get the static library name +old_lib=$(sed -ne '/^old_library=/ s,^old_library='\''\(.*\)'\''.*$,\1,p' $archive) + +# update the archive with the dll and import lib name. +if sed -e 's,^dlname='\'\'',dlname='\'cyg${module}.dll\'',;s,^library_names='\'\'',library_names='\'lib${module}.dll.a\'',' $archive > ${archive}.tmp +then cat ${archive}.tmp > ${archive} +fi +rm -f ${archive}.tmp + +# update the install archive if it exists +if [ -f ${archive}i ] ; then + if sed -e 's,^dlname='\'\'',dlname='\'../bin/cyg${module}.dll\'',;s,^library_names='\'\'',library_names='\'lib${module}.dll.a\'',' ${archive}i > ${archive}i.tmp + then cat ${archive}i.tmp > ${archive}i + fi + rm -f ${archive}i.tmp +fi + +# update the archive with the install dir if not already set +libdir=${prefix}/lib +if sed -e '/^libdir=/ s,='\'\'',='\'$libdir\'',' $archive > ${archive}.tmp +then cat ${archive}.tmp > $archive +fi +rm -f ${archive}.tmp + + +# report the link command to stdout +eval echo $CC -shared -o cyg${module}.dll -Wl,--out-implib=lib${module}.dll.a \ +-Wl,--export-all-symbols -Wl,--whole-archive $old_lib -Wl,--no-whole-archive ${dependency_libs} + +# do the link command +eval $CC -shared -o cyg${module}.dll -Wl,--out-implib=lib${module}.dll.a -Wl,--export-all-symbols \ +-Wl,--whole-archive $old_lib -Wl,--no-whole-archive ${dependency_libs} + diff -Naurp imlib-1.9.14/utils/Makefile.in imlib-1.9.14-cygwin/utils/Makefile.in --- imlib-1.9.14/utils/Makefile.in Mon Mar 25 16:50:25 2002 +++ imlib-1.9.14-cygwin/utils/Makefile.in Wed Mar 27 12:41:53 2002 @@ -50,6 +50,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ +EXEEXT = .exe NORMAL_INSTALL = : PRE_INSTALL = : @@ -165,8 +166,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done