Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 87613 Details for
Bug 133824
gnome-libs-1.4.2 --as-needed fix
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
gnome-libs-1.4.2 --as-needed fix, works with eautoreconf
gnome-libs-1.4.2-as-needed.patch (text/plain), 42.69 KB, created by
Thomas S. Howard
on 2006-05-26 20:10:27 UTC
(
hide
)
Description:
gnome-libs-1.4.2 --as-needed fix, works with eautoreconf
Filename:
MIME Type:
Creator:
Thomas S. Howard
Created:
2006-05-26 20:10:27 UTC
Size:
42.69 KB
patch
obsolete
>--- gnome-libs-1.4.2/macros/gnome-gettext.m4.orig 2006-05-26 19:14:19.000000000 -0700 >+++ gnome-libs-1.4.2/macros/gnome-gettext.m4 2006-05-26 19:15:48.000000000 -0700 >@@ -12,327 +12,265 @@ > > # serial 5 > >-AC_DEFUN(AM_GNOME_WITH_NLS, >- [AC_MSG_CHECKING([whether NLS is requested]) >- dnl Default is enabled NLS >- AC_ARG_ENABLE(nls, >- [ --disable-nls do not use Native Language Support], >- USE_NLS=$enableval, USE_NLS=yes) >- AC_MSG_RESULT($USE_NLS) >- AC_SUBST(USE_NLS) >- >- BUILD_INCLUDED_LIBINTL=no >- USE_INCLUDED_LIBINTL=no >- >- dnl If we use NLS figure out what method >- if test "$USE_NLS" = "yes"; then >- AC_DEFINE(ENABLE_NLS) >-# AC_MSG_CHECKING([whether included gettext is requested]) >-# AC_ARG_WITH(included-gettext, >-# [ --with-included-gettext use the GNU gettext library included here], >-# nls_cv_force_use_gnu_gettext=$withval, >-# nls_cv_force_use_gnu_gettext=no) >-# AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) >- nls_cv_force_use_gnu_gettext="no" >- >- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" >- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then >- dnl User does not insist on using GNU NLS library. Figure out what >- dnl to use. If gettext or catgets are available (in this order) we >- dnl use this. Else we have to fall back to GNU NLS library. >- dnl catgets is only used if permitted by option --with-catgets. >- nls_cv_header_intl= >- nls_cv_header_libgt= >- CATOBJEXT=NONE >- >- AC_CHECK_HEADER(libintl.h, >- [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, >- [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")], >- gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) >- >- if test "$gt_cv_func_gettext_libc" != "yes"; then >- AC_CHECK_LIB(intl, bindtextdomain, >- [AC_CACHE_CHECK([for gettext in libintl], >- gt_cv_func_gettext_libintl, >- [AC_CHECK_LIB(intl, gettext, >- gt_cv_func_gettext_libintl=yes, >- gt_cv_func_gettext_libintl=no)], >- gt_cv_func_gettext_libintl=no)]) >- fi >- >- if test "$gt_cv_func_gettext_libc" = "yes" \ >- || test "$gt_cv_func_gettext_libintl" = "yes"; then >- AC_DEFINE(HAVE_GETTEXT) >- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, >- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl >- if test "$MSGFMT" != "no"; then >- AC_CHECK_FUNCS(dcgettext) >- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) >- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, >- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) >- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; >- return _nl_msg_cat_cntr], >- [CATOBJEXT=.gmo >- DATADIRNAME=share], >- [CATOBJEXT=.mo >- DATADIRNAME=lib]) >- INSTOBJEXT=.mo >- fi >- fi >- >- # Added by Martin Baulig 12/15/98 for libc5 systems >- if test "$gt_cv_func_gettext_libc" != "yes" \ >- && test "$gt_cv_func_gettext_libintl" = "yes"; then >- INTLLIBS=-lintl >- LIBS=`echo $LIBS | sed -e 's/-lintl//'` >- fi >- ]) >+AC_DEFUN(AM_GNOME_WITH_NLS,[ >+ AC_MSG_CHECKING([whether NLS is requested]) >+ dnl Default is enabled NLS >+ AC_ARG_ENABLE(nls,[ --disable-nls do not use Native Language Support], >+ [USE_NLS="$enableval"],[USE_NLS="yes"]) >+ AC_MSG_RESULT($USE_NLS) >+ AC_SUBST(USE_NLS) > >- if test "$CATOBJEXT" = "NONE"; then >- AC_MSG_CHECKING([whether catgets can be used]) >- AC_ARG_WITH(catgets, >- [ --with-catgets use catgets functions if available], >- nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) >- AC_MSG_RESULT($nls_cv_use_catgets) >+ BUILD_INCLUDED_LIBINTL="no" >+ USE_INCLUDED_LIBINTL="no" > >- if test "$nls_cv_use_catgets" = "yes"; then >- dnl No gettext in C library. Try catgets next. >- AC_CHECK_LIB(i, main) >- AC_CHECK_FUNC(catgets, >- [AC_DEFINE(HAVE_CATGETS) >- INTLOBJS="\$(CATOBJS)" >- AC_PATH_PROG(GENCAT, gencat, no)dnl >-# if test "$GENCAT" != "no"; then >-# AC_PATH_PROG(GMSGFMT, gmsgfmt, no) >-# if test "$GMSGFMT" = "no"; then >-# AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, >-# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) >-# fi >-# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, >-# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) >-# USE_INCLUDED_LIBINTL=yes >-# CATOBJEXT=.cat >-# INSTOBJEXT=.cat >-# DATADIRNAME=lib >-# INTLDEPS='$(top_builddir)/intl/libintl.a' >-# INTLLIBS=$INTLDEPS >-# LIBS=`echo $LIBS | sed -e 's/-lintl//'` >-# nls_cv_header_intl=intl/libintl.h >-# nls_cv_header_libgt=intl/libgettext.h >-# fi >- ]) >- fi >+ dnl If we use NLS figure out what method >+ if test "$USE_NLS" = "yes"; then >+ AC_DEFINE(ENABLE_NLS) >+ nls_cv_force_use_gnu_gettext="no" >+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" >+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then >+ dnl User does not insist on using GNU NLS library. Figure out what >+ dnl to use. If gettext or catgets are available (in this order) we >+ dnl use this. Else we have to fall back to GNU NLS library. >+ dnl catgets is only used if permitted by option --with-catgets. >+ nls_cv_header_intl= >+ nls_cv_header_libgt= >+ CATOBJEXT="NONE" >+ AC_CHECK_HEADER(libintl.h, >+ [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, >+ [AC_TRY_LINK([#include <libintl.h> >+ ],[return (int) gettext ("")], >+ gt_cv_func_gettext_libc="yes", >+ gt_cv_func_gettext_libc="no" >+ ) >+ ]) >+ if test "$gt_cv_func_gettext_libc" != "yes"; then >+ AC_CHECK_LIB(intl, bindtextdomain, >+ [AC_CACHE_CHECK([for gettext in libintl], >+ gt_cv_func_gettext_libintl, >+ [AC_CHECK_LIB(intl, gettext, >+ gt_cv_func_gettext_libintl="yes", >+ gt_cv_func_gettext_libintl="no" >+ )], >+ gt_cv_func_gettext_libintl="no" >+ ) >+ ]) >+ fi >+ if test "$gt_cv_func_gettext_libc" = "yes" \ >+ || test "$gt_cv_func_gettext_libintl" = "yes"; then >+ AC_DEFINE(HAVE_GETTEXT) >+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, >+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no >+ )dnl >+ if test "$MSGFMT" != "no"; then >+ AC_CHECK_FUNCS(dcgettext) >+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) >+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, >+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"]) >+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; >+ return _nl_msg_cat_cntr], >+ [CATOBJEXT=".gmo" >+ DATADIRNAME="share"], >+ [CATOBJEXT=".mo" >+ DATADIRNAME="lib"] >+ ) >+ INSTOBJEXT=".mo" >+ fi > fi >- >- if test "$CATOBJEXT" = "NONE"; then >- dnl Neither gettext nor catgets in included in the C library. >- dnl Fall back on GNU gettext library. >- nls_cv_use_gnu_gettext=yes >+ # Added by Martin Baulig 12/15/98 for libc5 systems >+ if test "$gt_cv_func_gettext_libc" != "yes" \ >+ && test "$gt_cv_func_gettext_libintl" = "yes"; then >+ INTLLIBS="-lintl" >+ LIBS=`echo $LIBS | sed -e 's/-lintl//'` >+ fi >+ ]) >+ if test "$CATOBJEXT" = "NONE"; then >+ AC_MSG_CHECKING([whether catgets can be used]) >+ AC_ARG_WITH(catgets,[ --with-catgets use catgets functions if available], >+ [nls_cv_use_catgets="$withval"],[nls_cv_use_catgets="no"]) >+ AC_MSG_RESULT($nls_cv_use_catgets) >+ if test "$nls_cv_use_catgets" = "yes"; then >+ dnl No gettext in C library. Try catgets next. >+ AC_CHECK_LIB(i, main) >+ AC_CHECK_FUNC(catgets, >+ [AC_DEFINE(HAVE_CATGETS) >+ INTLOBJS="\$(CATOBJS)" >+ AC_PATH_PROG(GENCAT, gencat, no)dnl >+ ]) > fi > fi >- >+ if test "$CATOBJEXT" = "NONE"; then >+ dnl Neither gettext nor catgets in included in the C library. >+ dnl Fall back on GNU gettext library. >+ nls_cv_use_gnu_gettext="yes" >+ fi >+ fi > if test "$nls_cv_use_gnu_gettext" != "yes"; then > AC_DEFINE(ENABLE_NLS) > else >- # Unset this variable since we use the non-zero value as a flag. >- CATOBJEXT= >-# dnl Mark actions used to generate GNU NLS library. >-# INTLOBJS="\$(GETTOBJS)" >-# AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, >-# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) >-# AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) >-# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, >-# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) >-# AC_SUBST(MSGFMT) >-# USE_INCLUDED_LIBINTL=yes >-# CATOBJEXT=.gmo >-# INSTOBJEXT=.mo >-# DATADIRNAME=share >-# INTLDEPS='$(top_builddir)/intl/libintl.a' >-# INTLLIBS=$INTLDEPS >-# LIBS=`echo $LIBS | sed -e 's/-lintl//'` >-# nls_cv_header_intl=intl/libintl.h >-# nls_cv_header_libgt=intl/libgettext.h >- fi >- >- dnl Test whether we really found GNU xgettext. >- if test "$XGETTEXT" != ":"; then >- dnl If it is no GNU xgettext we define it as : so that the >- dnl Makefiles still can work. >- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then >- : ; >- else >- AC_MSG_RESULT( >- [found xgettext program is not GNU xgettext; ignore it]) >- XGETTEXT=":" >- fi >+ # Unset this variable since we use the non-zero value as a flag. >+ CATOBJEXT= >+ fi >+ dnl Test whether we really found GNU xgettext. >+ if test "$XGETTEXT" != ":"; then >+ dnl If it is no GNU xgettext we define it as : so that the >+ dnl Makefiles still can work. >+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then >+ : >+ else >+ AC_MSG_RESULT([found xgettext program is not GNU xgettext; ignore it]) >+ XGETTEXT=":" > fi >- >- # We need to process the po/ directory. >- POSUB=po >- else >- DATADIRNAME=share >- nls_cv_header_intl=intl/libintl.h >- nls_cv_header_libgt=intl/libgettext.h > fi >- AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) >- AC_OUTPUT_COMMANDS( >- [case "$CONFIG_FILES" in *po/Makefile.in*) >- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile >- esac]) >- >- >-# # If this is used in GNU gettext we have to set USE_NLS to `yes' >-# # because some of the sources are only built for this goal. >-# if test "$PACKAGE" = gettext; then >-# USE_NLS=yes >-# USE_INCLUDED_LIBINTL=yes >-# fi >- >- dnl These rules are solely for the distribution goal. While doing this >- dnl we only have to keep exactly one list of the available catalogs >- dnl in configure.in. >- for lang in $ALL_LINGUAS; do >- GMOFILES="$GMOFILES $lang.gmo" >- POFILES="$POFILES $lang.po" >- done >- >- dnl Make all variables we use known to autoconf. >- AC_SUBST(BUILD_INCLUDED_LIBINTL) >- AC_SUBST(USE_INCLUDED_LIBINTL) >- AC_SUBST(CATALOGS) >- AC_SUBST(CATOBJEXT) >- AC_SUBST(DATADIRNAME) >- AC_SUBST(GMOFILES) >- AC_SUBST(INSTOBJEXT) >- AC_SUBST(INTLDEPS) >- AC_SUBST(INTLLIBS) >- AC_SUBST(INTLOBJS) >- AC_SUBST(POFILES) >- AC_SUBST(POSUB) >+ # We need to process the po/ directory. >+ POSUB="po" >+ else >+ DATADIRNAME="share" >+ nls_cv_header_intl="intl/libintl.h" >+ nls_cv_header_libgt="intl/libgettext.h" >+ fi >+ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) >+ AC_OUTPUT_COMMANDS([ >+ case "$CONFIG_FILES" in *po/Makefile.in*) >+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile >+ esac > ]) >+ dnl These rules are solely for the distribution goal. While doing this >+ dnl we only have to keep exactly one list of the available catalogs >+ dnl in configure.in. >+ for lang in $ALL_LINGUAS; do >+ GMOFILES="$GMOFILES $lang.gmo" >+ POFILES="$POFILES $lang.po" >+ done > >-AC_DEFUN(AM_GNOME_GETTEXT, >- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl >- AC_REQUIRE([AC_PROG_CC])dnl >- AC_REQUIRE([AC_PROG_RANLIB])dnl >- AC_REQUIRE([AC_ISC_POSIX])dnl >- AC_REQUIRE([AC_HEADER_STDC])dnl >- AC_REQUIRE([AC_C_CONST])dnl >- AC_REQUIRE([AC_C_INLINE])dnl >- AC_REQUIRE([AC_TYPE_OFF_T])dnl >- AC_REQUIRE([AC_TYPE_SIZE_T])dnl >- AC_REQUIRE([AC_FUNC_ALLOCA])dnl >- AC_REQUIRE([AC_FUNC_MMAP])dnl >- >- AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ >-unistd.h sys/param.h]) >- AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ >-strdup __argz_count __argz_stringify __argz_next]) >- >- if test "${ac_cv_func_stpcpy+set}" != "set"; then >- AC_CHECK_FUNCS(stpcpy) >- fi >- if test "${ac_cv_func_stpcpy}" = "yes"; then >- AC_DEFINE(HAVE_STPCPY) >- fi >- >- AM_LC_MESSAGES >- AM_GNOME_WITH_NLS >- >- if test "x$CATOBJEXT" != "x"; then >- if test "x$ALL_LINGUAS" = "x"; then >- LINGUAS= >- else >- AC_MSG_CHECKING(for catalogs to be installed) >- NEW_LINGUAS= >- if test "x$LINGUAS" = "x"; then >- LINGUAS=$ALL_LINGUAS >- fi >- for lang in $LINGUAS; do >- case "$ALL_LINGUAS" in >- *\ $lang\ *|$lang\ *|*\ $lang) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; >- esac >- done >- LINGUAS=$NEW_LINGUAS >- AC_MSG_RESULT($LINGUAS) >- fi >- >- dnl Construct list of names of catalog files to be constructed. >- if test -n "$LINGUAS"; then >- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done >- fi >- fi >- >- dnl The reference to <locale.h> in the installed <libintl.h> file >- dnl must be resolved because we cannot expect the users of this >- dnl to define HAVE_LOCALE_H. >- if test $ac_cv_header_locale_h = yes; then >- INCLUDE_LOCALE_H="#include <locale.h>" >- else >- INCLUDE_LOCALE_H="\ >-/* The system does not provide the header <locale.h>. Take care yourself. */" >- fi >- AC_SUBST(INCLUDE_LOCALE_H) >- >- dnl Determine which catalog format we have (if any is needed) >- dnl For now we know about two different formats: >- dnl Linux libc-5 and the normal X/Open format >- test -d intl || mkdir intl >- if test "$CATOBJEXT" = ".cat"; then >- AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) >- >- dnl Transform the SED scripts while copying because some dumb SEDs >- dnl cannot handle comments. >- sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed >- fi >- dnl po2tbl.sed is always needed. >- sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ >- $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed >+ dnl Make all variables we use known to autoconf. >+ AC_SUBST(BUILD_INCLUDED_LIBINTL) >+ AC_SUBST(USE_INCLUDED_LIBINTL) >+ AC_SUBST(CATALOGS) >+ AC_SUBST(CATOBJEXT) >+ AC_SUBST(DATADIRNAME) >+ AC_SUBST(GMOFILES) >+ AC_SUBST(INSTOBJEXT) >+ AC_SUBST(INTLDEPS) >+ AC_SUBST(INTLLIBS) >+ AC_SUBST(INTLOBJS) >+ AC_SUBST(POFILES) >+ AC_SUBST(POSUB) >+]) > >- dnl In the intl/Makefile.in we have a special dependency which makes >- dnl only sense for gettext. We comment this out for non-gettext >- dnl packages. >- if test "$PACKAGE" = "gettext"; then >- GT_NO="#NO#" >- GT_YES= >- else >- GT_NO= >- GT_YES="#YES#" >- fi >- AC_SUBST(GT_NO) >- AC_SUBST(GT_YES) >+AC_DEFUN(AM_GNOME_GETTEXT,[ >+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl >+ AC_REQUIRE([AC_PROG_CC])dnl >+ AC_REQUIRE([AC_PROG_RANLIB])dnl >+ AC_REQUIRE([AC_ISC_POSIX])dnl >+ AC_REQUIRE([AC_HEADER_STDC])dnl >+ AC_REQUIRE([AC_C_CONST])dnl >+ AC_REQUIRE([AC_C_INLINE])dnl >+ AC_REQUIRE([AC_TYPE_OFF_T])dnl >+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl >+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl >+ AC_REQUIRE([AC_FUNC_MMAP])dnl > >- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly >- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). >- dnl Try to locate is. >- MKINSTALLDIRS= >- if test -n "$ac_aux_dir"; then >- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" >- fi >- if test -z "$MKINSTALLDIRS"; then >- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" >- fi >- AC_SUBST(MKINSTALLDIRS) >+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h unistd.h sys/param.h]) >+ AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ >+ strdup __argz_count __argz_stringify __argz_next]) > >- dnl *** For now the libtool support in intl/Makefile is not for real. >- l= >- AC_SUBST(l) >+ if test "${ac_cv_func_stpcpy+set}" != "set"; then >+ AC_CHECK_FUNCS(stpcpy) >+ fi >+ if test "${ac_cv_func_stpcpy}" = "yes"; then >+ AC_DEFINE(HAVE_STPCPY) >+ fi > >- dnl Generate list of files to be processed by xgettext which will >- dnl be included in po/Makefile. >- test -d po || mkdir po >- if test "x$srcdir" != "x."; then >- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then >- posrcprefix="$srcdir/" >- else >- posrcprefix="../$srcdir/" >- fi >- else >- posrcprefix="../" >- fi >- rm -f po/POTFILES >- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ >- < $srcdir/po/POTFILES.in > po/POTFILES >- ]) >+ gt_LC_MESSAGES >+ AM_GNOME_WITH_NLS > >+ if test "x$CATOBJEXT" != "x"; then >+ if test "x$ALL_LINGUAS" = "x"; then >+ LINGUAS= >+ else >+ AC_MSG_CHECKING(for catalogs to be installed) >+ NEW_LINGUAS= >+ if test "x$LINGUAS" = "x"; then >+ LINGUAS=$ALL_LINGUAS >+ fi >+ for lang in $LINGUAS; do >+ case "$ALL_LINGUAS" in >+ *\ $lang\ *|$lang\ *|*\ $lang) >+ NEW_LINGUAS="$NEW_LINGUAS $lang" >+ ;; >+ esac >+ done >+ LINGUAS=$NEW_LINGUAS >+ AC_MSG_RESULT($LINGUAS) >+ fi >+ dnl Construct list of names of catalog files to be constructed. >+ if test -n "$LINGUAS"; then >+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done >+ fi >+ fi >+ dnl The reference to <locale.h> in the installed <libintl.h> file >+ dnl must be resolved because we cannot expect the users of this >+ dnl to define HAVE_LOCALE_H. >+ if test "$ac_cv_header_locale_h" = "yes"; then >+ INCLUDE_LOCALE_H="#include <locale.h>" >+ else >+ INCLUDE_LOCALE_H="\ >+ /* The system does not provide the header <locale.h>. Take care yourself. */" >+ fi >+ AC_SUBST(INCLUDE_LOCALE_H) >+ dnl Determine which catalog format we have (if any is needed) >+ dnl For now we know about two different formats: >+ dnl Linux libc-5 and the normal X/Open format >+ test -d intl || mkdir intl >+ if test "$CATOBJEXT" = ".cat"; then >+ AC_CHECK_HEADER(linux/version.h, msgformat="linux", msgformat="xopen") >+ dnl Transform the SED scripts while copying because some dumb SEDs >+ dnl cannot handle comments. >+ sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed >+ fi >+ dnl po2tbl.sed is always needed. >+ sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ >+ $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed >+ dnl In the intl/Makefile.in we have a special dependency which makes >+ dnl only sense for gettext. We comment this out for non-gettext >+ dnl packages. >+ if test "$PACKAGE" = "gettext"; then >+ GT_NO="#NO#" >+ GT_YES= >+ else >+ GT_NO= >+ GT_YES="#YES#" >+ fi >+ AC_SUBST(GT_NO) >+ AC_SUBST(GT_YES) >+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly >+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). >+ dnl Try to locate is. >+ MKINSTALLDIRS= >+ if test -n "$ac_aux_dir"; then >+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" >+ fi >+ if test -z "$MKINSTALLDIRS"; then >+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" >+ fi >+ AC_SUBST(MKINSTALLDIRS) >+ dnl *** For now the libtool support in intl/Makefile is not for real. >+ l= >+ AC_SUBST(l) >+ dnl Generate list of files to be processed by xgettext which will >+ dnl be included in po/Makefile. >+ test -d po || mkdir po >+ if test "x$srcdir" != "x."; then >+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then >+ posrcprefix="$srcdir/" >+ else >+ posrcprefix="../$srcdir/" >+ fi >+ else >+ posrcprefix="../" >+ fi >+ rm -f po/POTFILES >+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ >+< $srcdir/po/POTFILES.in > po/POTFILES >+]) >--- gnome-libs-1.4.2/macros/gnome-support.m4.orig 1999-01-05 17:45:19.000000000 -0800 >+++ gnome-libs-1.4.2/macros/gnome-support.m4 2006-05-26 19:39:57.000000000 -0700 >@@ -3,66 +3,62 @@ > dnl Gnome libraries. Sets LIBOBJS, might define some macros. > dnl This should only be used when building the Gnome libs; > dnl Gnome clients should not need this macro. >-AC_DEFUN([GNOME_SUPPORT_CHECKS],[ >- # we need an `awk' to build `gnomesupport.h' >- AC_REQUIRE([AC_PROG_AWK]) >+AC_DEFUN([GNOME_SUPPORT_CHECKS],[AC_REQUIRE([AC_PROG_AWK]) >+ # we need an 'awk' to build 'gnomesupport.h' > > # this should go away soon >- need_gnome_support=yes >- >- save_LIBOBJS="$LIBOBJS" >- LIBOBJS= >- >- AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o") >- >- # for `scandir' >+ need_gnome_support="yes" >+ l_opt= >+ AC_CHECK_FUNCS(getopt_long,,l_opt="no") >+ if test "$l_opt" = "no"; then >+ AC_LIBOBJ(getopt) >+ AC_LIBOBJ(getopt1) >+ fi >+ # for 'scandir' > AC_HEADER_DIRENT > >- # copied from `configure.in' of `libiberty' >+ # copied from 'configure.in' of 'libiberty' > vars="program_invocation_short_name program_invocation_name sys_errlist" > for v in $vars; do >- AC_MSG_CHECKING([for $v]) >+ AC_MSG_CHECKING(for $v) > AC_CACHE_VAL(gnome_cv_var_$v, > [AC_TRY_LINK([int *p;], [extern int $v; p = &$v;], >- [eval "gnome_cv_var_$v=yes"], >- [eval "gnome_cv_var_$v=no"])]) >- if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then >- AC_MSG_RESULT(yes) >- n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` >- AC_DEFINE_UNQUOTED($n) >- else >- AC_MSG_RESULT(no) >- fi >+ [eval "gnome_cv_var_$v=yes"], >+ [eval "gnome_cv_var_$v=no"])]) >+ if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then >+ AC_MSG_RESULT(yes) >+ n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` >+ AC_DEFINE_UNQUOTED($n) >+ else >+ AC_MSG_RESULT(no) >+ fi > done >+ AC_REPLACE_FUNCS([memmove mkstemp scandir strcasecmp strerror strndup strnlen]) >+ AC_REPLACE_FUNCS([strtok_r strtod strtol strtoul vasprintf vsnprintf]) > >- 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") >- >- # to include `error.c' error.c has some HAVE_* checks >- AC_CHECK_FUNCS(vprintf doprnt strerror_r) >- AM_FUNC_ERROR_AT_LINE >+ r_path= >+ AC_CHECK_FUNCS(realpath,,r_path="no") >+ if test "$r_path" = "no"; then >+ AC_LIBOBJ(canonicalize) >+ fi >+ # to include 'error.c' error.c has some HAVE_* checks >+ AC_CHECK_FUNCS([vprintf doprnt strerror_r]) >+ AC_FUNC_ERROR_AT_LINE > > # This is required if we declare setreuid () and setregid (). > AC_TYPE_UID_T > > # see if we need to declare some functions. Solaris is notorious for >- # putting functions into the `libc' but not listing them in the headers >- AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h dirent.h) >- GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize) >- GCC_NEED_DECLARATION(scandir,[ >-#ifdef HAVE_DIRENT_H >-#include <dirent.h> >-#endif >-]) >- >- # 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'` >+ # putting functions into the 'libc' but not listing them in the headers >+ AC_CHECK_HEADERS([string.h strings.h stdlib.h unistd.h dirent.h]) >+ GCC_NEED_DECLARATIONS([gethostname setreuid setregid getpagesize]) >+ GCC_NEED_DECLARATION(scandir, >+ [#ifdef HAVE_DIRENT_H >+ #include <dirent.h> >+ #endif] >+ ) > AC_SUBST(need_gnome_support) > AC_SUBST(LTLIBOBJS) > >- LIBOBJS="$save_LIBOBJS" >- AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes) >+ AM_CONDITIONAL(BUILD_GNOME_SUPPORT,test "$need_gnome_support" = "yes") > ]) >--- gnome-libs-1.4.2/configure.in.orig 2006-05-26 18:49:04.000000000 -0700 >+++ gnome-libs-1.4.2/configure.in 2006-05-26 19:41:24.000000000 -0700 >@@ -5,8 +5,9 @@ > AC_INIT(gnome.h) > AM_CONFIG_HEADER(config.h) > >-AC_CANONICAL_SYSTEM >+AC_CANONICAL_TARGET > >+AC_ARG_PROGRAM > AM_INIT_AUTOMAKE(gnome-libs, 1.4.2) > > AM_ACLOCAL_INCLUDE(macros) >@@ -14,16 +15,14 @@ > AC_ISC_POSIX > AC_PROG_CC > AC_STDC_HEADERS >-AC_ARG_PROGRAM >- >-AM_PROG_LIBTOOL >+AC_PROG_LIBTOOL > > AM_MAINTAINER_MODE > > dnl > dnl let applications configure for gnome > dnl >-gnome_cv_use_gnome=yes >+gnome_cv_use_gnome="yes" > > GNOME_COMPILE_WARNINGS > >@@ -36,12 +35,15 @@ > dnl (we want to make sure it matches with the gtk we're using) > > changequote(,)dnl >-GLIB_CFLAGS=`echo $GTK_CFLAGS | sed 's/^.*\(-I[^ ]*glib[^ ]* *-I[^ ]*\).*$/\1/'` >-GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'` >+GLIB_CFLAGS=`echo $GTK_CFLAGS | sed -e 's/^.*\(-I[^ ]*glib[^ ]* *-I[^ ]*\).*$/\1/'` >+GLIB_LDFLAGS=`echo $GTK_LIBS | \ >+ sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'` > if test -z "$GLIB_LDFLAGS" ; then >- GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/\(-L[^ ]*\) .*$/\1/' -e 's/^.*\(-L[^ ]*\)$/\1/'` >+ GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*\(-L[^ ]*\) .*$/\1/'` > fi >-GLIB_LIBS="$GLIB_LDFLAGS `echo $GTK_LIBS | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`" >+GLIB_LIBS=`echo $GTK_LIBS | sed -e 's/^.*\(-lglib[^ ]*\).*$/\1/'` >+GMODULE_LIBS=`echo $GTK_LIBS | \ >+ sed -e 's/^.*\(-lgmodule[^ ]*\).*\(-lglib[^ ]*\).*\(-ldl[^ ]*\).*$/\1 \2 \3/'` > changequote([,])dnl > > AC_SUBST(GLIB_CFLAGS) >@@ -58,38 +60,37 @@ > AC_SUBST(HAVE_GTK_DOC) > > dnl Let people disable the gtk-doc stuff. >-AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto) >+AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]],[enable_gtk_doc="$enableval"],[enable_gtk_doc="auto"]) > >-if test x$enable_gtk_doc = xauto ; then >- if test x$GTKDOC = xtrue ; then >- enable_gtk_doc=yes >+if test "x$enable_gtk_doc" = "xauto" ; then >+ if test "x$GTKDOC" = "xtrue" ; then >+ enable_gtk_doc="yes" > else >- enable_gtk_doc=no >+ enable_gtk_doc="no" > fi > fi > > dnl NOTE: We need to use a separate automake conditional for this > dnl to make this work with the tarballs. >-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) >+AM_CONDITIONAL(ENABLE_GTK_DOC, test "x$enable_gtk_doc" = "xyes") > > > # We would like indent, but don't require it. > AC_CHECK_PROG(INDENT, indent, indent) > >-_found_perl=0 >+_found_perl="no" > if test -n "$PERL" && $PERL -v | grep 'version 5.' > /dev/null ; then >- _found_perl=1 >+ _found_perl="yes" > else > # The version string for perl changed for 'version 5' to 'v5' in > # perl 5.6 or therabouts > if test -n "$PERL" && $PERL -v | grep 'v5.' > /dev/null ; then >- _found_perl=1 >+ _found_perl="yes" > fi >- > fi > > REBUILD=\# >-if test $_found_perl -eq 1; then >+if test "$_found_perl" = "yes"; then > if test -n "$AWK" ; then > REBUILD= > fi >@@ -97,15 +98,16 @@ > AC_SUBST(REBUILD) > > dnl Utility conditional >-AM_CONDITIONAL(FALSE, test x = y) >+AM_CONDITIONAL(FALSE, test "x" = "y") > >-AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]], enable_debug="$enableval", enable_debug=no) >+AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],[enable_debug="$enableval"],[enable_debug="no"]) > >-if test x$enable_debug = xyes ; then >+if test "x$enable_debug" = "xyes"; then > AC_DEFINE(GNOME_ENABLE_DEBUG) > fi > > ALL_LINGUAS="az ca cs da de el en_GB es et eu fi fr ga gl hr hu it ja ko lt lv ms nl nn no pl pt pt_BR ro ru sk sl sp sr sv ta tr uk vi wa zh_CN zh_TW" >+ > AM_GNOME_GETTEXT > # AM_GNOME_GETTEXT above substs $DATADIRNAME > # this is the directory where the *.{mo,gmo} files are installed >@@ -115,28 +117,28 @@ > AC_CHECK_LIB(m, floor) > > AC_CHECK_HEADERS(dlfcn.h locale.h) >- >-AC_CACHE_CHECK([for gmodule support], ac_cv_gmodule,[ >- save_LDFLAGS="$LDFLAGS" >- LDFLAGS="$LDFLAGS `glib-config --libs gmodule`" >- AC_TRY_RUN([ >-#include <gmodule.h> >- >-int main() >-{ >- return g_module_supported() == 0; >-}],ac_cv_gmodule=yes,ac_cv_gmodule=no,ac_cv_gmodule=yes) >- LDFLAGS="$save_LDFLAGS"]) >-if test $ac_cv_gmodule = no; then >- AC_MSG_ERROR([Dynamic linking is not available on this platform. Some apps, >-like panel, will not run properly.]) >+AC_CACHE_CHECK([for gmodule support],ac_cv_gmodule, >+ [save_LIBS="$LIBS" >+ LIBS="$GMODULE_LIBS" >+ AC_TRY_RUN([#include <gmodule.h> >+ int main() { >+ return g_module_supported()==0; >+ }], >+ ac_cv_gmodule="yes", >+ ac_cv_gmodule="no", >+ ac_cv_gmodule="yes" >+ ) >+ LIBS="$save_LIBS"] >+) >+if test "$ac_cv_gmodule" = "no"; then >+ AC_MSG_ERROR([Dynamic linking is not available on this platform. Some apps, like panel, will not run properly.]) > fi > > AC_CHECK_FUNCS(strerror gethostbyname setfsgid setenv putenv strdup) > > NSL_LIBS="" >-if test $ac_cv_func_gethostbyname = no; then >- AC_CHECK_LIB(nsl,gethostbyname,NSL_LIBS=-lnsl) >+if test "$ac_cv_func_gethostbyname" = "no"; then >+ AC_CHECK_LIB(nsl,gethostbyname,NSL_LIBS="-lnsl") > fi > AC_SUBST(NSL_LIBS) > AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)]) >@@ -157,22 +159,22 @@ > dnl > AC_MSG_CHECKING([for sa_len in struct sockaddr]) > AC_TRY_COMPILE( >+ [#include <sys/socket.h>], >+ [struct sockaddr s; s.sa_len;], >+ [sa_len_ok="yes"], >+ [sa_len_ok="no"]) >+AC_MSG_RESULT($sa_len_ok) >+if test "x$sa_len_ok" = "xno"; then >+ AC_MSG_CHECKING([for sa_len with -D_SOCKADDR_LEN]) >+ xCPPFLAGS="$CPPFLAGS" >+ CPPFLAGS="$CPPFLAGS -D_SOCKADDR_LEN" >+ AC_TRY_COMPILE( > [#include <sys/socket.h>], > [struct sockaddr s; s.sa_len;], >- [sa_len_ok=yes], >- [sa_len_ok=no]) >-AC_MSG_RESULT($sa_len_ok) >-if test x$sa_len_ok = xno; then >- AC_MSG_CHECKING([for sa_len with -D_SOCKADDR_LEN]) >- xCPPFLAGS="$CPPFLAGS" >- CPPFLAGS="$CPPFLAGS -D_SOCKADDR_LEN" >- AC_TRY_COMPILE( >- [#include <sys/socket.h>], >- [struct sockaddr s; s.sa_len;], >- [AC_DEFINE(_SOCKADDR_LEN) >- sa_len_ok=yes], >- [sa_len_ok=no]) >- CPPFLAGS="$xCPPFLAGS" >+ [AC_DEFINE(_SOCKADDR_LEN) >+ sa_len_ok="yes"], >+ [sa_len_ok="no"]) >+ CPPFLAGS="$xCPPFLAGS" > fi > AC_MSG_RESULT($sa_len_ok) > >@@ -182,17 +184,17 @@ > > AC_MSG_CHECKING([for Unix98 sendmsg]) > AC_TRY_LINK([ >-#include <stdio.h> >-#include <sys/types.h> >-#include <sys/socket.h> >-],[ >-struct msghdr hdr; >-hdr.msg_control = NULL; >-hdr.msg_controllen = 0; >-sendmsg (0, &hdr, 0); >-],[ >-AC_DEFINE(HAVE_SENDMSG) >-AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]) >+ #include <stdio.h> >+ #include <sys/types.h> >+ #include <sys/socket.h> >+ ],[struct msghdr hdr; >+ hdr.msg_control = NULL; >+ hdr.msg_controllen = 0; >+ sendmsg (0, &hdr, 0);], >+ [AC_DEFINE(HAVE_SENDMSG) >+ AC_MSG_RESULT(yes)], >+ [AC_MSG_RESULT(no)] >+) > > AC_CHECK_UTMP > AC_CHECK_LASTLOG >@@ -200,13 +202,12 @@ > AC_CHECK_HEADERS(pty.h util.h libutil.h ttyent.h) > > AC_CHECK_LIB(util, openpty, >- [ >- AC_CHECK_LIB(util, login_tty, [AC_DEFINE(HAVE_LOGIN_TTY)]) >+ [AC_CHECK_LIB(util, login_tty,[AC_DEFINE(HAVE_LOGIN_TTY)]) > AC_DEFINE(HAVE_OPENPTY) > AC_DEFINE(HAVE_LIBUTIL) > UTIL_LIBS="-lutil" >- AC_SUBST(UTIL_LIBS) >- ]) >+ AC_SUBST(UTIL_LIBS)] >+) > > AC_CHECK_FUNCS(grantpt utmpxname utmpname getutmpx getutent getttyent) > AC_CHECK_FUNCS(updwtmpx updwtmp fcntl flock strrchr seteuid setreuid) >@@ -214,10 +215,10 @@ > AC_CHECK_HEADERS(stropts.h) > > dnl And workaround for a Autoconf 2.4 bug: >-if test x$ac_cv_func_grantpt = xyes; then >- : >+if test "x$ac_cv_func_grantpt" = "xyes"; then >+ : > else >- AC_CHECK_LIB(pt, grantpt) >+ AC_CHECK_LIB(pt, grantpt) > fi > > dnl >@@ -227,75 +228,99 @@ > > dnl Test for libz > AC_CHECK_LIB(z, inflate, >- AC_CHECK_HEADER(zlib.h, >- Z_LIBS="-lz"; AC_DEFINE(HAVE_LIBZ))) >-AC_CHECK_LIB(z, compress, , >- AC_MSG_ERROR([[ >+ [AC_CHECK_LIB(z, compress, >+ [AC_CHECK_HEADER(zlib.h, >+ Z_LIBS="-lz" >+ AC_DEFINE(HAVE_LIBZ), >+ AC_MSG_ERROR([**** LIBZ header file not found ***]) >+ )] >+ )], >+ AC_MSG_ERROR([[ > *** Incorrect libz version found. Please make sure you do not have > *** an outdated libz.a or libz.so hiding in your X11 distribution or > *** elsewhere on your system. Versions of libz with the "compress" and >-*** "uncompress" symbols are sufficiently recent to build GNOME.]])) >+*** "uncompress" symbols are sufficiently recent to build GNOME.]]) >+) > > dnl Test for libjpeg > AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, >- jpeg_ok=yes, >- jpeg_ok=no) >-if test "$jpeg_ok" = yes; then >- AC_MSG_CHECKING([for jpeglib.h]) >- AC_TRY_CPP( >-[#include <stdio.h> >-#undef PACKAGE >-#undef VERSION >-/* AAARGH!!! jpeglib.h defines HAVE_STDLIB_H. */ >-#undef HAVE_STDDEF_H >-#undef HAVE_STDLIB_H >-#include <jpeglib.h>], >- jpeg_ok=yes, >- jpeg_ok=no) >- AC_MSG_RESULT($jpeg_ok) >- if test "$jpeg_ok" = yes; then >- JPEG_LIBS="-ljpeg"; AC_DEFINE(HAVE_LIBJPEG) >- fi >-fi >+ [AC_CHECK_HEADER(jpeglib.h, >+ JPEG_LIBS="-ljpeg" >+ AC_DEFINE(HAVE_LIBJPEG) >+ )] >+) >+dnl AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, >+dnl jpeg_ok="yes", >+dnl jpeg_ok="no") >+dnl if test "$jpeg_ok" = "yes"; then >+dnl AC_MSG_CHECKING([for jpeglib.h]) >+dnl AC_TRY_CPP([#include <stdio.h> >+dnl #undef PACKAGE >+dnl #undef VERSION >+dnl /* AAARGH!!! jpeglib.h defines HAVE_STDLIB_H.*/ >+dnl #undef HAVE_STDDEF_H >+dnl #undef HAVE_STDLIB_H >+dnl #include <jpeglib.h> >+dnl ],jpeg_ok="yes", >+dnl jpeg_ok="no") >+dnl AC_MSG_RESULT($jpeg_ok) >+dnl if test "$jpeg_ok" = "yes"; then >+dnl JPEG_LIBS="-ljpeg" >+dnl AC_DEFINE(HAVE_LIBJPEG) >+dnl fi >+dnl fi > > 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, >- png_ok=yes, >- png_ok=no),,$Z_LIBS -lm) >-if test "$png_ok" = yes; then >+ [AC_CHECK_HEADER(png.h, >+ png_ok="yes", >+ 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>], >- [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct >-;], >- png_ok=yes, >- png_ok=no) >- AC_CHECK_LIB(png, png_get_IHDR, >- png_ok=yes,png_ok=no) >+ AC_TRY_COMPILE([#include <png.h> >+ ],[png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;], >+ png_ok="yes", >+ png_ok="no") >+ AC_CHECK_LIB(png, png_get_IHDR, >+ png_ok="yes", >+ png_ok="no") > AC_MSG_RESULT($png_ok) >- if test "$png_ok" = yes; then >+ if test "$png_ok" = "yes"; then > PNG_LIBS="-lpng $Z_LIBS"; AC_DEFINE(HAVE_LIBPNG) > fi > fi >@@ -305,48 +330,49 @@ > AC_CHECK_HEADERS(utime.h) > AC_FUNC_MMAP > >-AC_ARG_ENABLE(prefer-db1, [ --enable-prefer-db1 Prefer Berkeley DB 1.x] [default=no]],[prefer_db1="$enableval"],[prefer_db1=no]) >+AC_ARG_ENABLE(prefer-db1, [ --enable-prefer-db1 Prefer Berkeley DB 1.x] [default=no]], >+ [prefer_db1="$enableval"],[prefer_db1="no"]) > dnl > dnl Check for db stuff (gnome-metadata) > dnl > DB_LIB= > AC_CHECK_FUNC(dbopen, [], >-if test "$prefer_db1" = "yes"; then >- AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1", >- AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb", >- AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3", >- AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4", >- AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode]) >+ [if test "$prefer_db1" = "yes"; then >+ AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1", >+ [AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb", >+ [AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3", >+ [AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4", >+ AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode]) >+ )] >+ )] >+ )] > ) >- ) >- ) >- ) >-else >- AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb", >- AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1", >- AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3", >- AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4", >- AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode]) >+ else >+ AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb", >+ [AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1", >+ [AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3", >+ [AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4", >+ AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode]) >+ )] >+ )] >+ )] > ) >- ) >- ) >- ) >-fi >+fi] > ) > > dnl look for db headers > if test "$prefer_db1" = "yes"; then >- AC_CHECK_HEADERS(db_185.h db1/db.h) >- if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nono; then >- AC_MSG_ERROR([Berkeley db library required for Gnome]) >- fi >- AC_DEFINE(PREFER_DB1) >+ AC_CHECK_HEADERS(db_185.h db1/db.h) >+ if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = "nono"; then >+ AC_MSG_ERROR([Berkeley db library required for Gnome]) >+ fi >+ AC_DEFINE(PREFER_DB1) > else >- AC_CHECK_HEADERS(db.h db_185.h db1/db.h) >+ AC_CHECK_HEADERS(db.h db_185.h db1/db.h) > >- if test "$ac_cv_header_db_h$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nonono; then >- AC_MSG_ERROR([Berkeley db library required for Gnome]) >- fi >+ if test "$ac_cv_header_db_h$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = "nonono"; then >+ AC_MSG_ERROR([Berkeley db library required for Gnome]) >+ fi > fi > > dnl >@@ -356,13 +382,13 @@ > AC_PATH_X > AC_PATH_XTRA > >-AM_PATH_GDK_IMLIB(1.9, [define_imlib_1_9=true],[ >- AM_PATH_GDK_IMLIB(1.8,[ >- LIBGNOMEUI_LIBS="$LIBGNOMEUI_LIBS $PNG_LIBS" >- ],[AC_MSG_ERROR([*** IMLIB 1.8 not installed - please install first ***])])]) >- >- >-if test x$define_imlib_1_9 = xtrue; then >+AM_PATH_GDK_IMLIB(1.9,[define_imlib_1_9="true"], >+ [AM_PATH_GDK_IMLIB(1.8, >+ [LIBGNOMEUI_LIBS="$LIBGNOMEUI_LIBS $PNG_LIBS"], >+ [AC_MSG_ERROR([*** IMLIB 1.8 not installed - please install first ***])] >+ )] >+) >+if test "x$define_imlib_1_9" = "xtrue"; then > AC_DEFINE(HAVE_IMLIB_1_9) > fi > >@@ -406,8 +432,9 @@ > dnl test-gnome > dnl > >-AC_ARG_ENABLE(test-gnome, [ --enable-test-gnome compile the test-gnome examples [default=yes]],[compile_test_gnome="$enableval"],[compile_test_gnome=yes]) >-AM_CONDITIONAL(COMPILE_TEST_GNOME, test x$compile_test_gnome = xyes) >+AC_ARG_ENABLE(test-gnome, [ --enable-test-gnome compile the test-gnome examples [default=yes]], >+ [compile_test_gnome="$enableval"],[compile_test_gnome="yes"]) >+AM_CONDITIONAL(COMPILE_TEST_GNOME, test "x$compile_test_gnome" = "xyes") > > dnl AC_CONFIG_SUBDIRS(libgtktty) > >@@ -429,7 +456,7 @@ > dnl > AC_ARG_WITH(kde-datadir, [ --with-kde-datadir=DIR Location of KDE data]) > >-if test "x$with_kde_datadir" = x ; then >+if test "x$with_kde_datadir" = "x"; then > kde_datadir=/usr/share > else > kde_datadir=$with_kde_datadir >@@ -453,7 +480,6 @@ > AC_SUBST(GNOME_IDLDIR) > AC_SUBST(LIBSUPPORT) > AC_SUBST(SUPPORTINCS) >- > AC_SUBST(LIBGNOME_LIBS) > AC_SUBST(LIBGNOMEUI_LIBS) > AC_SUBST(LIBGTKXMHTML_LIBS) >--- gnome-libs-1.4.2/libgnome/Makefile.am.orig 2006-05-19 09:38:12.000000000 -0700 >+++ gnome-libs-1.4.2/libgnome/Makefile.am 2006-05-17 20:29:44.000000000 -0700 >@@ -87,7 +87,7 @@ > gnome-config.o: parse-path.cP > > libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir) >-libgnome_la_LIBADD = $(GLIB_LIBS) -lm >+libgnome_la_LIBADD = $(LIBGNOME_LIBS) -lm -lpopt > > bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \ > gconfigger gnome-gen-mimedb >--- gnome-libs-1.4.2/libgnomeui/Makefile.am.orig 2002-03-26 22:49:42.000000000 -0800 >+++ gnome-libs-1.4.2/libgnomeui/Makefile.am 2006-05-17 20:51:03.000000000 -0700 >@@ -268,46 +268,47 @@ > $(man_MANS) > > libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir) >-libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) >+libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) $(top_builddir)/libgnome/libgnome.la \ >+$(top_builddir)/libart_lgpl/libart_lgpl.la -lpopt > > gnome_segv_LDADD = \ > libgnomeui.la \ > $(top_builddir)/libgnome/libgnome.la \ > $(top_builddir)/libart_lgpl/libart_lgpl.la \ > @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ >- $(INTLLIBS) >+ $(INTLLIBS) -lpopt > > ted_demo_LDADD = \ > libgnomeui.la \ > $(top_builddir)/libgnome/libgnome.la \ > $(top_builddir)/libart_lgpl/libart_lgpl.la \ > @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ >- $(INTLLIBS) >+ $(INTLLIBS) -lpopt > > stock_demo_LDADD = \ > libgnomeui.la \ > $(top_builddir)/libgnome/libgnome.la \ > $(top_builddir)/libart_lgpl/libart_lgpl.la \ > @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ >- $(INTLLIBS) >+ $(INTLLIBS) -lpopt > > winhints_demo_LDADD = \ > libgnomeui.la \ > $(top_builddir)/libgnome/libgnome.la \ > $(top_builddir)/libart_lgpl/libart_lgpl.la \ > @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ >- $(INTLLIBS) >+ $(INTLLIBS) -lpopt > > animator_demo_LDADD = \ > libgnomeui.la \ > $(top_builddir)/libgnome/libgnome.la \ > $(top_builddir)/libart_lgpl/libart_lgpl.la \ > @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ >- $(INTLLIBS) >+ $(INTLLIBS) -lpopt > > dock_demo_LDADD = \ > libgnomeui.la \ > $(top_builddir)/libgnome/libgnome.la \ > $(top_builddir)/libart_lgpl/libart_lgpl.la \ > @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ >- $(INTLLIBS) >+ $(INTLLIBS) -lpopt >--- gnome-libs-1.4.2/libgnorba/Makefile.am.orig 2002-03-26 22:48:18.000000000 -0800 >+++ gnome-libs-1.4.2/libgnorba/Makefile.am 2006-05-17 21:45:13.000000000 -0700 >@@ -80,7 +80,16 @@ > Table.h > > libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) >-libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm >+ >+libgnorba_la_LIBADD = \ >+ $(ORBIT_LIBS) $(GLIB_LIBS) \ >+ $(top_builddir)/libgnome/libgnome.la \ >+ $(top_builddir)/libgnomeui/libgnomeui.la \ >+ $(top_builddir)/libart_lgpl/libart_lgpl.la \ >+ -lpopt -lm >+ >+ >+libgnorbagtk_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) > > loadshlib_SOURCES = loadshlib.c > >--- gnome-libs-1.4.2/zvt/Makefile.am.orig 2002-03-18 13:18:10.000000000 -0800 >+++ gnome-libs-1.4.2/zvt/Makefile.am 2006-05-17 21:18:54.000000000 -0700 >@@ -23,6 +23,8 @@ > > libzvt_la_LDFLAGS = -version-info 5:0:3 -rpath $(libdir) > >+libzvt_la_LIBADD = $(GTK_LIBS) $(GDK_IMLIB_LIBS) $(UTIL_LIBS) >+ > libzvtinclude_HEADERS = \ > lists.h \ > vt.h \ >@@ -56,7 +58,8 @@ > $(UTIL_LIBS) \ > $(GTK_LIBS) \ > $(GDK_IMLIB_LIBS) \ >- @LIBSUPPORT@ $(INTLLIBS) >+ @LIBSUPPORT@ $(INTLLIBS) \ >+ -lgdk > > test_utmp_SOURCES = \ > gnome-utmp.c \
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=87613">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 133824
:
87087
|
87088
|
87612
| 87613 |
101903
