Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1
gnome-libs
gnome-libs-1.4.2.dif
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gnome-libs-1.4.2.dif of Package gnome-libs
--- gnome-libs-1.4.1.7/Makefile.am +++ gnome-libs-1.4.1.7/Makefile.am @@ -3,6 +3,7 @@ # Actually the earliest release that should be OK should be 1.2e, I think. # Still, 1.3 is the first "released" automake that is OK. AUTOMAKE_OPTIONS = 1.3 +ACLOCAL_AMFLAGS = -I macros bin_SCRIPTS = gnome-config gnome-bug --- gnome-libs-1.4.1.7/configure.in +++ gnome-libs-1.4.1.7/configure.in @@ -96,9 +96,6 @@ fi AC_SUBST(REBUILD) -dnl Utility conditional -AM_CONDITIONAL(FALSE, test x = y) - AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]], enable_debug="$enableval", enable_debug=no) if test x$enable_debug = xyes ; then @@ -227,8 +224,8 @@ dnl Test for libz AC_CHECK_LIB(z, inflate, - AC_CHECK_HEADER(zlib.h, - Z_LIBS="-lz"; AC_DEFINE(HAVE_LIBZ))) + [AC_CHECK_HEADER(zlib.h, + Z_LIBS="-lz"; AC_DEFINE(HAVE_LIBZ))]) AC_CHECK_LIB(z, compress, , AC_MSG_ERROR([[ *** Incorrect libz version found. Please make sure you do not have @@ -260,31 +257,31 @@ dnl Test for libtiff AC_CHECK_LIB(tiff, TIFFReadScanline, - AC_CHECK_HEADER(tiffio.h, - TIFF_LIBS="-ltiff"; AC_DEFINE(HAVE_LIBTIFF)), - AC_CHECK_LIB(tiff, TIFFWriteScanline, - AC_CHECK_HEADER(tiffio.h, - TIFF_LIBS="-ltiff $JPEG_LIBS $Z_LIBS"; AC_DEFINE(HAVE_LIBTIFF)), - AC_CHECK_LIB(tiff34, TIFFFlushData, - AC_CHECK_HEADER(tiffio.h, - TIFF_LIBS="-ltiff34 $JPEG_LIBS $Z_LIBS"; AC_DEFINE(HAVE_LIBTIFF)),, -$JPEG_LIBS $Z_LIBS -lm), $JPEG_LIBS $Z_LIBS -lm), -lm) + [AC_CHECK_HEADER(tiffio.h, + TIFF_LIBS="-ltiff"; AC_DEFINE(HAVE_LIBTIFF))], + [AC_CHECK_LIB(tiff, TIFFWriteScanline, + [AC_CHECK_HEADER(tiffio.h, + TIFF_LIBS="-ltiff $JPEG_LIBS $Z_LIBS"; AC_DEFINE(HAVE_LIBTIFF))], + [AC_CHECK_LIB(tiff34, TIFFFlushData, + [AC_CHECK_HEADER(tiffio.h, + TIFF_LIBS="-ltiff34 $JPEG_LIBS $Z_LIBS"; AC_DEFINE(HAVE_LIBTIFF))],, +$JPEG_LIBS $Z_LIBS -lm)], $JPEG_LIBS $Z_LIBS -lm)], -lm) dnl Test for libgif AC_CHECK_LIB(gif, DGifOpenFileName, - AC_CHECK_HEADER(gif_lib.h, - GIF_LIBS="-lgif"; AC_DEFINE(HAVE_LIBGIF)),,$GTK_LIBS) + [AC_CHECK_HEADER(gif_lib.h, + GIF_LIBS="-lgif"; AC_DEFINE(HAVE_LIBGIF))],,$GTK_LIBS) dnl Test for libungif AC_CHECK_LIB(ungif, DGifOpenFileName, - AC_CHECK_HEADER(gif_lib.h, - GIF_LIBS="-lungif"; AC_DEFINE(HAVE_LIBGIF)),,$GTK_LIBS) + [AC_CHECK_HEADER(gif_lib.h, + GIF_LIBS="-lungif"; AC_DEFINE(HAVE_LIBGIF))],,$GTK_LIBS) dnl Test for libpng AC_CHECK_LIB(png, png_read_info, - AC_CHECK_HEADER(png.h, + [AC_CHECK_HEADER(png.h, png_ok=yes, - png_ok=no),,$Z_LIBS -lm) + png_ok=no)],,$Z_LIBS -lm) if test "$png_ok" = yes; then AC_MSG_CHECKING([for png_structp in png.h]) AC_TRY_COMPILE([#include <png.h>], --- gnome-libs-1.4.1.7/gtk-xmhtml/Makefile.am +++ gnome-libs-1.4.1.7/gtk-xmhtml/Makefile.am @@ -60,7 +60,7 @@ htmltest_SOURCES = test.c -htmltest: libgtkxmhtml.la +htmltest$(EXEEXT): libgtkxmhtml.la htmltest_LDADD = libgtkxmhtml.la $(LIBGTKXMHTML_LIBS) $(INTLLIBS) @@ -75,3 +75,9 @@ ## If I dont do this, for some wierdo reason, it tries to compile gtk-xmhtml.o #gtk-xmhtml: # echo + + + + + + --- gnome-libs-1.4.1.7/macros/error-at-line.m4 +++ gnome-libs-1.4.1.7/macros/error-at-line.m4 @@ -0,0 +1,14 @@ +dnl From Jim Meyering. Use this if you use the GNU error.[ch]. +dnl FIXME: Migrate into libit + +AC_DEFUN([AM_FUNC_ERROR_AT_LINE], +[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, + [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], + am_cv_lib_error_at_line=yes, + am_cv_lib_error_at_line=no)]) + if test $am_cv_lib_error_at_line = no; then + AC_LIBOBJ(error) + fi +]) + + --- gnome-libs-1.4.1.7/macros/gnome-support.m4 +++ gnome-libs-1.4.1.7/macros/gnome-support.m4 @@ -10,10 +10,10 @@ # this should go away soon need_gnome_support=yes - save_LIBOBJS="$LIBOBJS" - LIBOBJS= + save_LIB@&t@OBJS="$LIB@&t@OBJS" + LIB@&t@OBJS= - AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o") + AC_CHECK_FUNCS(getopt_long,,[AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)]) # for `scandir' AC_HEADER_DIRENT @@ -38,7 +38,7 @@ AC_REPLACE_FUNCS(memmove mkstemp scandir strcasecmp strerror strndup strnlen) AC_REPLACE_FUNCS(strtok_r strtod strtol strtoul vasprintf vsnprintf) - AC_CHECK_FUNCS(realpath,,LIBOBJS="$LIBOBJS canonicalize.o") + AC_CHECK_FUNCS(realpath,,[AC_LIBOBJ(canonicalize)]) # to include `error.c' error.c has some HAVE_* checks AC_CHECK_FUNCS(vprintf doprnt strerror_r) @@ -59,10 +59,10 @@ # Turn our LIBOBJS into libtool objects. This is gross, but it # requires changes to autoconf before it goes away. - LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'` + LTLIBOBJS=`echo "$LIB@&t@OBJS" | sed 's/\.o/.lo/g'` AC_SUBST(need_gnome_support) AC_SUBST(LTLIBOBJS) - LIBOBJS="$save_LIBOBJS" + LIB@&t@OBJS="$save_LIB@&t@OBJS" AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes) ]) --- gnome-libs-1.4.1.7/test-suite/Makefile.am +++ gnome-libs-1.4.1.7/test-suite/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = tests -# fileconvert.test \ +# fileconvert.test TESTS = \ metadata.test \ --- gnome-libs-1.4.1.7/zvt/Makefile.am +++ gnome-libs-1.4.1.7/zvt/Makefile.am @@ -42,7 +42,7 @@ # $(UTIL_LIBS) # We really dont want $(LIBS) linked in with this -gnome-pty-helper: gnome-pty-helper.o gnome-login-support.o gnome-utmp.o +gnome-pty-helper$(EXEEXT): gnome-pty-helper.o gnome-login-support.o gnome-utmp.o $(CC) -o $@ $^ $(UTIL_LIBS) # Since we do gnome-pty-helper manually, include the relevant sources here
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor