--- a/configure.in +++ b/configure.in @@ -145,26 +145,10 @@ [use Gtk+1.2 insted of Gtk+2]), [use_gtk1=yes]) -if test x"${use_gtk1}" = "xyes"; then -AM_PATH_GLIB(1.2.6,, - AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.), - gthread) -AM_PATH_GTK(1.2.0, , - AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)) -AM_PATH_GDK_PIXBUF(0.7.0, , - AC_MSG_ERROR(Cannot find GdkPixbuf: Is gdk-pixbuf-config in path?)) -dnl for libpng (In the case of Gtk+2, gdk_pixbuf_save are used.) -AC_CHECK_LIB(png,png_create_write_struct, - [PNGLIB_LIBS="-lz -lpng -lm"], - [AC_MSG_ERROR(libpng is required.)], - -lz -lm) - -else AM_PATH_GLIB_2_0(2.0.0,, AC_MSG_ERROR([glib-2.x is required]), gthread gobject) AM_PATH_GTK_2_0(2.0.0,, AC_MSG_ERROR([gtk+-2.x is required]), gthread gobject) AC_DEFINE(USE_GTK2,[], [Use Gtk+2.x instead of Gtk+1.x]) PNGLIB_LIBS="" -fi AC_SUBST(PNGLIB_LIBS) --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,14 +9,6 @@ bmp.h sockmsg.h codeconv.h unmime.h base64.h quoted-printable.h\ macopix_icon.h tar32api.h ssl.h -if HAVE_WINDRES -MACOPIX_RES = macopix.res -macopix.res: macopix_res.rc - $(WINDRES) $< -O coff -o $@ -else -MACOPIX_RES = -endif - EXTRA_DIST = \ macopix_res.rc.in\ macopix.ico\ @@ -25,9 +17,9 @@ tar32.dll\ libtar32.a -INCLUDES = @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@ $(GNUTLS_CFLAGS)\ +INCLUDES = @GTK_CFLAGS@ $(GNUTLS_CFLAGS)\ $(DISABLE_DEPRECATED) -LDADD = @GTK_LIBS@ @GDK_PIXBUF_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\ +LDADD = @GTK_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\ $(MACOPIX_RES) $(WINSOCK_LIBS) $(UNLHA32_LIBS) $(TAR32_LIBS) $(GNUTLS_LIBS) $(WIN32_ICONV_LIBS) CLEANFILES = *~ DISTCLEANFILES = .deps/*.P