Attachment #87613 for bug #133824





# 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)
    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
	])

  BUILD_INCLUDED_LIBINTL="no"
  USE_INCLUDED_LIBINTL="no"
	  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)

  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
        # 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=
     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=":"
#        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
      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
    # 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
#    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)
  ])
  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)
])
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

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])
   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)

  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

  gt_LC_MESSAGES
  AM_GNOME_WITH_NLS
   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
  ])

  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
])




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],[AC_REQUIRE([AC_PROG_AWK])
  # we need an 'awk' to build 'gnomesupport.h'
  AC_REQUIRE([AC_PROG_AWK])

  # this should go away soon
  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'
  vars="program_invocation_short_name program_invocation_name sys_errlist"
  for v in $vars; do
    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
  done
  AC_REPLACE_FUNCS([memmove mkstemp scandir strcasecmp strerror strndup strnlen])
  AC_REPLACE_FUNCS([strtok_r strtod strtol strtoul vasprintf vsnprintf])

  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'`
  AC_SUBST(need_gnome_support)
  AC_SUBST(LTLIBOBJS)

  AM_CONDITIONAL(BUILD_GNOME_SUPPORT,test "$need_gnome_support" = "yes")
  AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
])




AC_INIT(gnome.h)
AM_CONFIG_HEADER(config.h)

AC_CANONICAL_TARGET

AC_ARG_PROGRAM
AM_INIT_AUTOMAKE(gnome-libs, 1.4.2)

AM_ACLOCAL_INCLUDE(macros)

AC_ISC_POSIX
AC_PROG_CC
AC_STDC_HEADERS
AC_PROG_LIBTOOL

AM_PROG_LIBTOOL

AM_MAINTAINER_MODE

dnl
dnl let applications configure for gnome
dnl
gnome_cv_use_gnome="yes"

GNOME_COMPILE_WARNINGS


dnl (we want to make sure it matches with the gtk we're using)

changequote(,)dnl
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/'`
fi 
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)

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"])

if test "x$enable_gtk_doc" = "xauto" ; then
  if test "x$GTKDOC" = "xtrue" ; then
    enable_gtk_doc="yes"
  else
    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")
    

# We would like indent, but don't require it.
AC_CHECK_PROG(INDENT, indent, indent)

_found_perl="no"
if test -n "$PERL" && $PERL -v | grep 'version 5.' > /dev/null ; then
  _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="yes"
  fi

fi

REBUILD=\#
if test "$_found_perl" = "yes"; then
  if test -n "$AWK" ; then 
    REBUILD=
  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
  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

AC_CHECK_LIB(m, floor)

AC_CHECK_HEADERS(dlfcn.h locale.h)
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")
fi
AC_SUBST(NSL_LIBS)
AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)])

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;],
    [AC_DEFINE(_SOCKADDR_LEN)
    sa_len_ok="yes"],
    [sa_len_ok="no"])
  CPPFLAGS="$xCPPFLAGS"
    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"
fi
AC_MSG_RESULT($sa_len_ok)



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)]
)

AC_CHECK_UTMP
AC_CHECK_LASTLOG

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_CHECK_FUNCS(grantpt utmpxname utmpname getutmpx getutent getttyent)
AC_CHECK_FUNCS(updwtmpx updwtmp fcntl flock strrchr seteuid setreuid)

AC_CHECK_HEADERS(stropts.h)

dnl And workaround for a Autoconf 2.4 bug:
if test "x$ac_cv_func_grantpt" = "xyes"; then
  :
else
  AC_CHECK_LIB(pt, grantpt)
fi

dnl


dnl Test for libz
AC_CHECK_LIB(z, inflate,
  [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.]])
)

dnl Test for libjpeg
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
  [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)

dnl Test for libgif
AC_CHECK_LIB(gif, DGifOpenFileName,
  [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
)

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_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_MSG_RESULT($png_ok)
  if test "$png_ok" = "yes"; then
    PNG_LIBS="-lpng $Z_LIBS"; AC_DEFINE(HAVE_LIBPNG)
  fi
fi

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"])
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])
          )]
        )]
      )]
    )
  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)
else
  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
fi

dnl

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
    AC_DEFINE(HAVE_IMLIB_1_9)
fi


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")

dnl AC_CONFIG_SUBDIRS(libgtktty)


dnl
AC_ARG_WITH(kde-datadir, [  --with-kde-datadir=DIR         Location of KDE data])

if test "x$with_kde_datadir" = "x"; then
  kde_datadir=/usr/share
else
  kde_datadir=$with_kde_datadir

AC_SUBST(GNOME_IDLDIR)
AC_SUBST(LIBSUPPORT)
AC_SUBST(SUPPORTINCS)

AC_SUBST(LIBGNOME_LIBS)
AC_SUBST(LIBGNOMEUI_LIBS)
AC_SUBST(LIBGTKXMHTML_LIBS)

Lines 87-93 Link Here

(-)gnome-libs-1.4.2/libgnome/Makefile.am.orig (-1 / +1 lines)
87	gnome-config.o: parse-path.cP	87	gnome-config.o: parse-path.cP
88		88
89	libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir)	89	libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir)
90	libgnome_la_LIBADD = $(GLIB_LIBS) -lm	90	libgnome_la_LIBADD = $(LIBGNOME_LIBS) -lm -lpopt
91		91
92	bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \	92	bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \
93	gconfigger gnome-gen-mimedb	93	gconfigger gnome-gen-mimedb




	$(man_MANS)

libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir)
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) -lpopt

ted_demo_LDADD =	\
	libgnomeui.la 					\
	$(top_builddir)/libgnome/libgnome.la 		\
	$(top_builddir)/libart_lgpl/libart_lgpl.la 	\
	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
	$(INTLLIBS) -lpopt

stock_demo_LDADD =	\
	libgnomeui.la 					\
	$(top_builddir)/libgnome/libgnome.la 		\
	$(top_builddir)/libart_lgpl/libart_lgpl.la 	\
	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
	$(INTLLIBS) -lpopt

winhints_demo_LDADD =	\
	libgnomeui.la 					\
	$(top_builddir)/libgnome/libgnome.la 		\
	$(top_builddir)/libart_lgpl/libart_lgpl.la 	\
	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
	$(INTLLIBS) -lpopt

animator_demo_LDADD =	\
	libgnomeui.la 					\
	$(top_builddir)/libgnome/libgnome.la 		\
	$(top_builddir)/libart_lgpl/libart_lgpl.la 	\
	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
	$(INTLLIBS) -lpopt

dock_demo_LDADD =	\
	libgnomeui.la 					\
	$(top_builddir)/libgnome/libgnome.la 		\
	$(top_builddir)/libart_lgpl/libart_lgpl.la 	\
	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
	$(INTLLIBS) -lpopt




	Table.h

libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir)

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


Lines 23-28 Link Here

(-)gnome-libs-1.4.2/zvt/Makefile.am.orig (-1 / +4 lines)
23		23
24	libzvt_la_LDFLAGS = -version-info 5:0:3 -rpath $(libdir)	24	libzvt_la_LDFLAGS = -version-info 5:0:3 -rpath $(libdir)
25		25
		26	libzvt_la_LIBADD = $(GTK_LIBS) $(GDK_IMLIB_LIBS) $(UTIL_LIBS)
		27
26	libzvtinclude_HEADERS = \	28	libzvtinclude_HEADERS = \
27	lists.h \	29	lists.h \
28	vt.h \	30	vt.h \
Lines 56-62 Link Here
56	$(UTIL_LIBS) \	58	$(UTIL_LIBS) \
57	$(GTK_LIBS) \	59	$(GTK_LIBS) \
58	$(GDK_IMLIB_LIBS) \	60	$(GDK_IMLIB_LIBS) \
59	@LIBSUPPORT@ $(INTLLIBS)	61	@LIBSUPPORT@ $(INTLLIBS) \
		62	-lgdk
60		63
61	test_utmp_SOURCES = \	64	test_utmp_SOURCES = \
62	gnome-utmp.c \	65	gnome-utmp.c \

Return to bug 133824

Lines 268-313 Link Here

(-)gnome-libs-1.4.2/libgnomeui/Makefile.am.orig (-7 / +8 lines)
268	$(man_MANS)	268	$(man_MANS)
269		269
270	libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir)	270	libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir)
271	libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)	271	libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) $(top_builddir)/libgnome/libgnome.la \
		272	$(top_builddir)/libart_lgpl/libart_lgpl.la -lpopt
272		273
273	gnome_segv_LDADD = \	274	gnome_segv_LDADD = \
274	libgnomeui.la \	275	libgnomeui.la \
275	$(top_builddir)/libgnome/libgnome.la \	276	$(top_builddir)/libgnome/libgnome.la \
276	$(top_builddir)/libart_lgpl/libart_lgpl.la \	277	$(top_builddir)/libart_lgpl/libart_lgpl.la \
277	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \	278	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
278	$(INTLLIBS)	279	$(INTLLIBS) -lpopt
279		280
280	ted_demo_LDADD = \	281	ted_demo_LDADD = \
281	libgnomeui.la \	282	libgnomeui.la \
282	$(top_builddir)/libgnome/libgnome.la \	283	$(top_builddir)/libgnome/libgnome.la \
283	$(top_builddir)/libart_lgpl/libart_lgpl.la \	284	$(top_builddir)/libart_lgpl/libart_lgpl.la \
284	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \	285	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
285	$(INTLLIBS)	286	$(INTLLIBS) -lpopt
286		287
287	stock_demo_LDADD = \	288	stock_demo_LDADD = \
288	libgnomeui.la \	289	libgnomeui.la \
289	$(top_builddir)/libgnome/libgnome.la \	290	$(top_builddir)/libgnome/libgnome.la \
290	$(top_builddir)/libart_lgpl/libart_lgpl.la \	291	$(top_builddir)/libart_lgpl/libart_lgpl.la \
291	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \	292	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
292	$(INTLLIBS)	293	$(INTLLIBS) -lpopt
293		294
294	winhints_demo_LDADD = \	295	winhints_demo_LDADD = \
295	libgnomeui.la \	296	libgnomeui.la \
296	$(top_builddir)/libgnome/libgnome.la \	297	$(top_builddir)/libgnome/libgnome.la \
297	$(top_builddir)/libart_lgpl/libart_lgpl.la \	298	$(top_builddir)/libart_lgpl/libart_lgpl.la \
298	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \	299	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
299	$(INTLLIBS)	300	$(INTLLIBS) -lpopt
300		301
301	animator_demo_LDADD = \	302	animator_demo_LDADD = \
302	libgnomeui.la \	303	libgnomeui.la \
303	$(top_builddir)/libgnome/libgnome.la \	304	$(top_builddir)/libgnome/libgnome.la \
304	$(top_builddir)/libart_lgpl/libart_lgpl.la \	305	$(top_builddir)/libart_lgpl/libart_lgpl.la \
305	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \	306	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
306	$(INTLLIBS)	307	$(INTLLIBS) -lpopt
307		308
308	dock_demo_LDADD = \	309	dock_demo_LDADD = \
309	libgnomeui.la \	310	libgnomeui.la \
310	$(top_builddir)/libgnome/libgnome.la \	311	$(top_builddir)/libgnome/libgnome.la \
311	$(top_builddir)/libart_lgpl/libart_lgpl.la \	312	$(top_builddir)/libart_lgpl/libart_lgpl.la \
312	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \	313	@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \
313	$(INTLLIBS)	314	$(INTLLIBS) -lpopt

Lines 12-338 Link Here

(-)gnome-libs-1.4.2/macros/gnome-gettext.m4.orig (-307 / +245 lines)
12		12
13	# serial 5	13	# serial 5
14		14
15	AC_DEFUN(AM_GNOME_WITH_NLS,	15	AC_DEFUN(AM_GNOME_WITH_NLS,[
16	[AC_MSG_CHECKING([whether NLS is requested])	16	AC_MSG_CHECKING([whether NLS is requested])
17	dnl Default is enabled NLS	17	dnl Default is enabled NLS
18	AC_ARG_ENABLE(nls,	18	AC_ARG_ENABLE(nls,[ --disable-nls do not use Native Language Support],
19	[ --disable-nls do not use Native Language Support],	19	[USE_NLS="$enableval"],[USE_NLS="yes"])
20	USE_NLS=$enableval, USE_NLS=yes)	20	AC_MSG_RESULT($USE_NLS)
21	AC_MSG_RESULT($USE_NLS)	21	AC_SUBST(USE_NLS)
22	AC_SUBST(USE_NLS)
23
24	BUILD_INCLUDED_LIBINTL=no
25	USE_INCLUDED_LIBINTL=no
26
27	dnl If we use NLS figure out what method
28	if test "$USE_NLS" = "yes"; then
29	AC_DEFINE(ENABLE_NLS)
30	# AC_MSG_CHECKING([whether included gettext is requested])
31	# AC_ARG_WITH(included-gettext,
32	# [ --with-included-gettext use the GNU gettext library included here],
33	# nls_cv_force_use_gnu_gettext=$withval,
34	# nls_cv_force_use_gnu_gettext=no)
35	# AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
36	nls_cv_force_use_gnu_gettext="no"
37
38	nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
39	if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
40	dnl User does not insist on using GNU NLS library. Figure out what
41	dnl to use. If gettext or catgets are available (in this order) we
42	dnl use this. Else we have to fall back to GNU NLS library.
43	dnl catgets is only used if permitted by option --with-catgets.
44	nls_cv_header_intl=
45	nls_cv_header_libgt=
46	CATOBJEXT=NONE
47
48	AC_CHECK_HEADER(libintl.h,
49	[AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
50	[AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
51	gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
52
53	if test "$gt_cv_func_gettext_libc" != "yes"; then
54	AC_CHECK_LIB(intl, bindtextdomain,
55	[AC_CACHE_CHECK([for gettext in libintl],
56	gt_cv_func_gettext_libintl,
57	[AC_CHECK_LIB(intl, gettext,
58	gt_cv_func_gettext_libintl=yes,
59	gt_cv_func_gettext_libintl=no)],
60	gt_cv_func_gettext_libintl=no)])
61	fi
62
63	if test "$gt_cv_func_gettext_libc" = "yes" \
64	\|\| test "$gt_cv_func_gettext_libintl" = "yes"; then
65	AC_DEFINE(HAVE_GETTEXT)
66	AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
67	[test -z "`$ac_dir/$ac_word -h 2>&1 \| grep 'dv '`"], no)dnl
68	if test "$MSGFMT" != "no"; then
69	AC_CHECK_FUNCS(dcgettext)
70	AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
71	AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
72	[test -z "`$ac_dir/$ac_word -h 2>&1 \| grep '(HELP)'`"], :)
73	AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
74	return _nl_msg_cat_cntr],
75	[CATOBJEXT=.gmo
76	DATADIRNAME=share],
77	[CATOBJEXT=.mo
78	DATADIRNAME=lib])
79	INSTOBJEXT=.mo
80	fi
81	fi
82
83	# Added by Martin Baulig 12/15/98 for libc5 systems
84	if test "$gt_cv_func_gettext_libc" != "yes" \
85	&& test "$gt_cv_func_gettext_libintl" = "yes"; then
86	INTLLIBS=-lintl
87	LIBS=`echo $LIBS \| sed -e 's/-lintl//'`
88	fi
89	])
90		22
91	if test "$CATOBJEXT" = "NONE"; then	23	BUILD_INCLUDED_LIBINTL="no"
92	AC_MSG_CHECKING([whether catgets can be used])	24	USE_INCLUDED_LIBINTL="no"
93	AC_ARG_WITH(catgets,
94	[ --with-catgets use catgets functions if available],
95	nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
96	AC_MSG_RESULT($nls_cv_use_catgets)
97		25
98	if test "$nls_cv_use_catgets" = "yes"; then	26	dnl If we use NLS figure out what method
99	dnl No gettext in C library. Try catgets next.	27	if test "$USE_NLS" = "yes"; then
100	AC_CHECK_LIB(i, main)	28	AC_DEFINE(ENABLE_NLS)
101	AC_CHECK_FUNC(catgets,	29	nls_cv_force_use_gnu_gettext="no"
102	[AC_DEFINE(HAVE_CATGETS)	30	nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
103	INTLOBJS="\$(CATOBJS)"	31	if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
104	AC_PATH_PROG(GENCAT, gencat, no)dnl	32	dnl User does not insist on using GNU NLS library. Figure out what
105	# if test "$GENCAT" != "no"; then	33	dnl to use. If gettext or catgets are available (in this order) we
106	# AC_PATH_PROG(GMSGFMT, gmsgfmt, no)	34	dnl use this. Else we have to fall back to GNU NLS library.
107	# if test "$GMSGFMT" = "no"; then	35	dnl catgets is only used if permitted by option --with-catgets.
108	# AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,	36	nls_cv_header_intl=
109	# [test -z "`$ac_dir/$ac_word -h 2>&1 \| grep 'dv '`"], no)	37	nls_cv_header_libgt=
110	# fi	38	CATOBJEXT="NONE"
111	# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,	39	AC_CHECK_HEADER(libintl.h,
112	# [test -z "`$ac_dir/$ac_word -h 2>&1 \| grep '(HELP)'`"], :)	40	[AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
113	# USE_INCLUDED_LIBINTL=yes	41	[AC_TRY_LINK([#include <libintl.h>
114	# CATOBJEXT=.cat	42	],[return (int) gettext ("")],
115	# INSTOBJEXT=.cat	43	gt_cv_func_gettext_libc="yes",
116	# DATADIRNAME=lib	44	gt_cv_func_gettext_libc="no"
117	# INTLDEPS='$(top_builddir)/intl/libintl.a'	45	)
118	# INTLLIBS=$INTLDEPS	46	])
119	# LIBS=`echo $LIBS \| sed -e 's/-lintl//'`	47	if test "$gt_cv_func_gettext_libc" != "yes"; then
120	# nls_cv_header_intl=intl/libintl.h	48	AC_CHECK_LIB(intl, bindtextdomain,
121	# nls_cv_header_libgt=intl/libgettext.h	49	[AC_CACHE_CHECK([for gettext in libintl],
122	# fi	50	gt_cv_func_gettext_libintl,
123	])	51	[AC_CHECK_LIB(intl, gettext,
124	fi	52	gt_cv_func_gettext_libintl="yes",
		53	gt_cv_func_gettext_libintl="no"
		54	)],
		55	gt_cv_func_gettext_libintl="no"
		56	)
		57	])
		58	fi
		59	if test "$gt_cv_func_gettext_libc" = "yes" \
		60	\|\| test "$gt_cv_func_gettext_libintl" = "yes"; then
		61	AC_DEFINE(HAVE_GETTEXT)
		62	AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
		63	[test -z "`$ac_dir/$ac_word -h 2>&1 \| grep 'dv '`"], no
		64	)dnl
		65	if test "$MSGFMT" != "no"; then
		66	AC_CHECK_FUNCS(dcgettext)
		67	AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
		68	AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
		69	[test -z "`$ac_dir/$ac_word -h 2>&1 \| grep '(HELP)'`"])
		70	AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
		71	return _nl_msg_cat_cntr],
		72	[CATOBJEXT=".gmo"
		73	DATADIRNAME="share"],
		74	[CATOBJEXT=".mo"
		75	DATADIRNAME="lib"]
		76	)
		77	INSTOBJEXT=".mo"
		78	fi
125	fi	79	fi
126		80	# Added by Martin Baulig 12/15/98 for libc5 systems
127	if test "$CATOBJEXT" = "NONE"; then	81	if test "$gt_cv_func_gettext_libc" != "yes" \
128	dnl Neither gettext nor catgets in included in the C library.	82	&& test "$gt_cv_func_gettext_libintl" = "yes"; then
129	dnl Fall back on GNU gettext library.	83	INTLLIBS="-lintl"
130	nls_cv_use_gnu_gettext=yes	84	LIBS=`echo $LIBS \| sed -e 's/-lintl//'`
		85	fi
		86	])
		87	if test "$CATOBJEXT" = "NONE"; then
		88	AC_MSG_CHECKING([whether catgets can be used])
		89	AC_ARG_WITH(catgets,[ --with-catgets use catgets functions if available],
		90	[nls_cv_use_catgets="$withval"],[nls_cv_use_catgets="no"])
		91	AC_MSG_RESULT($nls_cv_use_catgets)
		92	if test "$nls_cv_use_catgets" = "yes"; then
		93	dnl No gettext in C library. Try catgets next.
		94	AC_CHECK_LIB(i, main)
		95	AC_CHECK_FUNC(catgets,
		96	[AC_DEFINE(HAVE_CATGETS)
		97	INTLOBJS="\$(CATOBJS)"
		98	AC_PATH_PROG(GENCAT, gencat, no)dnl
		99	])
131	fi	100	fi
132	fi	101	fi
133		102	if test "$CATOBJEXT" = "NONE"; then
		103	dnl Neither gettext nor catgets in included in the C library.
		104	dnl Fall back on GNU gettext library.
		105	nls_cv_use_gnu_gettext="yes"
		106	fi
		107	fi
134	if test "$nls_cv_use_gnu_gettext" != "yes"; then	108	if test "$nls_cv_use_gnu_gettext" != "yes"; then
135	AC_DEFINE(ENABLE_NLS)	109	AC_DEFINE(ENABLE_NLS)
136	else	110	else
137	# Unset this variable since we use the non-zero value as a flag.	111	# Unset this variable since we use the non-zero value as a flag.
138	CATOBJEXT=	112	CATOBJEXT=
139	# dnl Mark actions used to generate GNU NLS library.	113	fi
140	# INTLOBJS="\$(GETTOBJS)"	114	dnl Test whether we really found GNU xgettext.
141	# AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,	115	if test "$XGETTEXT" != ":"; then
142	# [test -z "`$ac_dir/$ac_word -h 2>&1 \| grep 'dv '`"], msgfmt)	116	dnl If it is no GNU xgettext we define it as : so that the
143	# AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)	117	dnl Makefiles still can work.
144	# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,	118	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
145	# [test -z "`$ac_dir/$ac_word -h 2>&1 \| grep '(HELP)'`"], :)	119	:
146	# AC_SUBST(MSGFMT)	120	else
147	# USE_INCLUDED_LIBINTL=yes	121	AC_MSG_RESULT([found xgettext program is not GNU xgettext; ignore it])
148	# CATOBJEXT=.gmo	122	XGETTEXT=":"
149	# INSTOBJEXT=.mo
150	# DATADIRNAME=share
151	# INTLDEPS='$(top_builddir)/intl/libintl.a'
152	# INTLLIBS=$INTLDEPS
153	# LIBS=`echo $LIBS \| sed -e 's/-lintl//'`
154	# nls_cv_header_intl=intl/libintl.h
155	# nls_cv_header_libgt=intl/libgettext.h
156	fi
157
158	dnl Test whether we really found GNU xgettext.
159	if test "$XGETTEXT" != ":"; then
160	dnl If it is no GNU xgettext we define it as : so that the
161	dnl Makefiles still can work.
162	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
163	: ;
164	else
165	AC_MSG_RESULT(
166	[found xgettext program is not GNU xgettext; ignore it])
167	XGETTEXT=":"
168	fi
169	fi	123	fi
170
171	# We need to process the po/ directory.
172	POSUB=po
173	else
174	DATADIRNAME=share
175	nls_cv_header_intl=intl/libintl.h
176	nls_cv_header_libgt=intl/libgettext.h
177	fi	124	fi
178	AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)	125	# We need to process the po/ directory.
179	AC_OUTPUT_COMMANDS(	126	POSUB="po"
180	[case "$CONFIG_FILES" in po/Makefile.in)	127	else
181	sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile	128	DATADIRNAME="share"
182	esac])	129	nls_cv_header_intl="intl/libintl.h"
183		130	nls_cv_header_libgt="intl/libgettext.h"
184		131	fi
185	# # If this is used in GNU gettext we have to set USE_NLS to `yes'	132	AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
186	# # because some of the sources are only built for this goal.	133	AC_OUTPUT_COMMANDS([
187	# if test "$PACKAGE" = gettext; then	134	case "$CONFIG_FILES" in po/Makefile.in)
188	# USE_NLS=yes	135	sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
189	# USE_INCLUDED_LIBINTL=yes	136	esac
190	# fi
191
192	dnl These rules are solely for the distribution goal. While doing this
193	dnl we only have to keep exactly one list of the available catalogs
194	dnl in configure.in.
195	for lang in $ALL_LINGUAS; do
196	GMOFILES="$GMOFILES $lang.gmo"
197	POFILES="$POFILES $lang.po"
198	done
199
200	dnl Make all variables we use known to autoconf.
201	AC_SUBST(BUILD_INCLUDED_LIBINTL)
202	AC_SUBST(USE_INCLUDED_LIBINTL)
203	AC_SUBST(CATALOGS)
204	AC_SUBST(CATOBJEXT)
205	AC_SUBST(DATADIRNAME)
206	AC_SUBST(GMOFILES)
207	AC_SUBST(INSTOBJEXT)
208	AC_SUBST(INTLDEPS)
209	AC_SUBST(INTLLIBS)
210	AC_SUBST(INTLOBJS)
211	AC_SUBST(POFILES)
212	AC_SUBST(POSUB)
213	])	137	])
		138	dnl These rules are solely for the distribution goal. While doing this
		139	dnl we only have to keep exactly one list of the available catalogs
		140	dnl in configure.in.
		141	for lang in $ALL_LINGUAS; do
		142	GMOFILES="$GMOFILES $lang.gmo"
		143	POFILES="$POFILES $lang.po"
		144	done
214		145
215	AC_DEFUN(AM_GNOME_GETTEXT,	146	dnl Make all variables we use known to autoconf.
216	[AC_REQUIRE([AC_PROG_MAKE_SET])dnl	147	AC_SUBST(BUILD_INCLUDED_LIBINTL)
217	AC_REQUIRE([AC_PROG_CC])dnl	148	AC_SUBST(USE_INCLUDED_LIBINTL)
218	AC_REQUIRE([AC_PROG_RANLIB])dnl	149	AC_SUBST(CATALOGS)
219	AC_REQUIRE([AC_ISC_POSIX])dnl	150	AC_SUBST(CATOBJEXT)
220	AC_REQUIRE([AC_HEADER_STDC])dnl	151	AC_SUBST(DATADIRNAME)
221	AC_REQUIRE([AC_C_CONST])dnl	152	AC_SUBST(GMOFILES)
222	AC_REQUIRE([AC_C_INLINE])dnl	153	AC_SUBST(INSTOBJEXT)
223	AC_REQUIRE([AC_TYPE_OFF_T])dnl	154	AC_SUBST(INTLDEPS)
224	AC_REQUIRE([AC_TYPE_SIZE_T])dnl	155	AC_SUBST(INTLLIBS)
225	AC_REQUIRE([AC_FUNC_ALLOCA])dnl	156	AC_SUBST(INTLOBJS)
226	AC_REQUIRE([AC_FUNC_MMAP])dnl	157	AC_SUBST(POFILES)
227		158	AC_SUBST(POSUB)
228	AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \	159	])
229	unistd.h sys/param.h])
230	AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
231	strdup __argz_count __argz_stringify __argz_next])
232
233	if test "${ac_cv_func_stpcpy+set}" != "set"; then
234	AC_CHECK_FUNCS(stpcpy)
235	fi
236	if test "${ac_cv_func_stpcpy}" = "yes"; then
237	AC_DEFINE(HAVE_STPCPY)
238	fi
239
240	AM_LC_MESSAGES
241	AM_GNOME_WITH_NLS
242
243	if test "x$CATOBJEXT" != "x"; then
244	if test "x$ALL_LINGUAS" = "x"; then
245	LINGUAS=
246	else
247	AC_MSG_CHECKING(for catalogs to be installed)
248	NEW_LINGUAS=
249	if test "x$LINGUAS" = "x"; then
250	LINGUAS=$ALL_LINGUAS
251	fi
252	for lang in $LINGUAS; do
253	case "$ALL_LINGUAS" in
254	\ $lang\ \|$lang\ \|\ $lang) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
255	esac
256	done
257	LINGUAS=$NEW_LINGUAS
258	AC_MSG_RESULT($LINGUAS)
259	fi
260
261	dnl Construct list of names of catalog files to be constructed.
262	if test -n "$LINGUAS"; then
263	for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
264	fi
265	fi
266
267	dnl The reference to <locale.h> in the installed <libintl.h> file
268	dnl must be resolved because we cannot expect the users of this
269	dnl to define HAVE_LOCALE_H.
270	if test $ac_cv_header_locale_h = yes; then
271	INCLUDE_LOCALE_H="#include <locale.h>"
272	else
273	INCLUDE_LOCALE_H="\
274	/* The system does not provide the header <locale.h>. Take care yourself. */"
275	fi
276	AC_SUBST(INCLUDE_LOCALE_H)
277
278	dnl Determine which catalog format we have (if any is needed)
279	dnl For now we know about two different formats:
280	dnl Linux libc-5 and the normal X/Open format
281	test -d intl \|\| mkdir intl
282	if test "$CATOBJEXT" = ".cat"; then
283	AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
284
285	dnl Transform the SED scripts while copying because some dumb SEDs
286	dnl cannot handle comments.
287	sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
288	fi
289	dnl po2tbl.sed is always needed.
290	sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
291	$srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
292		160
293	dnl In the intl/Makefile.in we have a special dependency which makes	161	AC_DEFUN(AM_GNOME_GETTEXT,[
294	dnl only sense for gettext. We comment this out for non-gettext	162	AC_REQUIRE([AC_PROG_MAKE_SET])dnl
295	dnl packages.	163	AC_REQUIRE([AC_PROG_CC])dnl
296	if test "$PACKAGE" = "gettext"; then	164	AC_REQUIRE([AC_PROG_RANLIB])dnl
297	GT_NO="#NO#"	165	AC_REQUIRE([AC_ISC_POSIX])dnl
298	GT_YES=	166	AC_REQUIRE([AC_HEADER_STDC])dnl
299	else	167	AC_REQUIRE([AC_C_CONST])dnl
300	GT_NO=	168	AC_REQUIRE([AC_C_INLINE])dnl
301	GT_YES="#YES#"	169	AC_REQUIRE([AC_TYPE_OFF_T])dnl
302	fi	170	AC_REQUIRE([AC_TYPE_SIZE_T])dnl
303	AC_SUBST(GT_NO)	171	AC_REQUIRE([AC_FUNC_ALLOCA])dnl
304	AC_SUBST(GT_YES)	172	AC_REQUIRE([AC_FUNC_MMAP])dnl
305		173
306	dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly	174	AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h unistd.h sys/param.h])
307	dnl find the mkinstalldirs script in another subdir but ($top_srcdir).	175	AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
308	dnl Try to locate is.	176	strdup __argz_count __argz_stringify __argz_next])
309	MKINSTALLDIRS=
310	if test -n "$ac_aux_dir"; then
311	MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
312	fi
313	if test -z "$MKINSTALLDIRS"; then
314	MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
315	fi
316	AC_SUBST(MKINSTALLDIRS)
317		177
318	dnl *** For now the libtool support in intl/Makefile is not for real.	178	if test "${ac_cv_func_stpcpy+set}" != "set"; then
319	l=	179	AC_CHECK_FUNCS(stpcpy)
320	AC_SUBST(l)	180	fi
		181	if test "${ac_cv_func_stpcpy}" = "yes"; then
		182	AC_DEFINE(HAVE_STPCPY)
		183	fi
321		184
322	dnl Generate list of files to be processed by xgettext which will	185	gt_LC_MESSAGES
323	dnl be included in po/Makefile.	186	AM_GNOME_WITH_NLS
324	test -d po \|\| mkdir po
325	if test "x$srcdir" != "x."; then
326	if test "x`echo $srcdir \| sed 's@/.*@@'`" = "x"; then
327	posrcprefix="$srcdir/"
328	else
329	posrcprefix="../$srcdir/"
330	fi
331	else
332	posrcprefix="../"
333	fi
334	rm -f po/POTFILES
335	sed -e "/^#/d" -e "/^\$/d" -e "s,., $posrcprefix& \\\\," -e "\$s/\(.\) \\\\/\1/" \
336	< $srcdir/po/POTFILES.in > po/POTFILES
337	])
338		187
		188	if test "x$CATOBJEXT" != "x"; then
		189	if test "x$ALL_LINGUAS" = "x"; then
		190	LINGUAS=
		191	else
		192	AC_MSG_CHECKING(for catalogs to be installed)
		193	NEW_LINGUAS=
		194	if test "x$LINGUAS" = "x"; then
		195	LINGUAS=$ALL_LINGUAS
		196	fi
		197	for lang in $LINGUAS; do
		198	case "$ALL_LINGUAS" in
		199	\ $lang\ \|$lang\ \|\ $lang)
		200	NEW_LINGUAS="$NEW_LINGUAS $lang"
		201	;;
		202	esac
		203	done
		204	LINGUAS=$NEW_LINGUAS
		205	AC_MSG_RESULT($LINGUAS)
		206	fi
		207	dnl Construct list of names of catalog files to be constructed.
		208	if test -n "$LINGUAS"; then
		209	for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
		210	fi
		211	fi
		212	dnl The reference to <locale.h> in the installed <libintl.h> file
		213	dnl must be resolved because we cannot expect the users of this
		214	dnl to define HAVE_LOCALE_H.
		215	if test "$ac_cv_header_locale_h" = "yes"; then
		216	INCLUDE_LOCALE_H="#include <locale.h>"
		217	else
		218	INCLUDE_LOCALE_H="\
		219	/* The system does not provide the header <locale.h>. Take care yourself. */"
		220	fi
		221	AC_SUBST(INCLUDE_LOCALE_H)
		222	dnl Determine which catalog format we have (if any is needed)
		223	dnl For now we know about two different formats:
		224	dnl Linux libc-5 and the normal X/Open format
		225	test -d intl \|\| mkdir intl
		226	if test "$CATOBJEXT" = ".cat"; then
		227	AC_CHECK_HEADER(linux/version.h, msgformat="linux", msgformat="xopen")
		228	dnl Transform the SED scripts while copying because some dumb SEDs
		229	dnl cannot handle comments.
		230	sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
		231	fi
		232	dnl po2tbl.sed is always needed.
		233	sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
		234	$srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
		235	dnl In the intl/Makefile.in we have a special dependency which makes
		236	dnl only sense for gettext. We comment this out for non-gettext
		237	dnl packages.
		238	if test "$PACKAGE" = "gettext"; then
		239	GT_NO="#NO#"
		240	GT_YES=
		241	else
		242	GT_NO=
		243	GT_YES="#YES#"
		244	fi
		245	AC_SUBST(GT_NO)
		246	AC_SUBST(GT_YES)
		247	dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
		248	dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
		249	dnl Try to locate is.
		250	MKINSTALLDIRS=
		251	if test -n "$ac_aux_dir"; then
252	MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
253	fi
254	if test -z "$MKINSTALLDIRS"; then
255	MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
256	fi
257	AC_SUBST(MKINSTALLDIRS)
258	dnl *** For now the libtool support in intl/Makefile is not for real.
259	l=
260	AC_SUBST(l)
261	dnl Generate list of files to be processed by xgettext which will
262	dnl be included in po/Makefile.
263	test -d po \|\| mkdir po
264	if test "x$srcdir" != "x."; then
265	if test "x`echo $srcdir \| sed 's@/.*@@'`" = "x"; then
266	posrcprefix="$srcdir/"
267	else
268	posrcprefix="../$srcdir/"
269	fi
270	else
271	posrcprefix="../"
272	fi
273	rm -f po/POTFILES
274	sed -e "/^#/d" -e "/^\$/d" -e "s,., $posrcprefix& \\\\," -e "\$s/\(.\) \\\\/\1/" \
275	< $srcdir/po/POTFILES.in > po/POTFILES
276	])

Lines 3-68 Link Here

(-)gnome-libs-1.4.2/macros/gnome-support.m4.orig (-44 / +40 lines)
3	dnl Gnome libraries. Sets LIBOBJS, might define some macros.	3	dnl Gnome libraries. Sets LIBOBJS, might define some macros.
4	dnl This should only be used when building the Gnome libs;	4	dnl This should only be used when building the Gnome libs;
5	dnl Gnome clients should not need this macro.	5	dnl Gnome clients should not need this macro.
6	AC_DEFUN([GNOME_SUPPORT_CHECKS],[	6	AC_DEFUN([GNOME_SUPPORT_CHECKS],[AC_REQUIRE([AC_PROG_AWK])
7	# we need an `awk' to build `gnomesupport.h'	7	# we need an 'awk' to build 'gnomesupport.h'
8	AC_REQUIRE([AC_PROG_AWK])
9		8
10	# this should go away soon	9	# this should go away soon
11	need_gnome_support=yes	10	need_gnome_support="yes"
12		11	l_opt=
13	save_LIBOBJS="$LIBOBJS"	12	AC_CHECK_FUNCS(getopt_long,,l_opt="no")
14	LIBOBJS=	13	if test "$l_opt" = "no"; then
15		14	AC_LIBOBJ(getopt)
16	AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o")	15	AC_LIBOBJ(getopt1)
17		16	fi
18	# for `scandir'	17	# for 'scandir'
19	AC_HEADER_DIRENT	18	AC_HEADER_DIRENT
20		19
21	# copied from `configure.in' of `libiberty'	20	# copied from 'configure.in' of 'libiberty'
22	vars="program_invocation_short_name program_invocation_name sys_errlist"	21	vars="program_invocation_short_name program_invocation_name sys_errlist"
23	for v in $vars; do	22	for v in $vars; do
24	AC_MSG_CHECKING([for $v])	23	AC_MSG_CHECKING(for $v)
25	AC_CACHE_VAL(gnome_cv_var_$v,	24	AC_CACHE_VAL(gnome_cv_var_$v,
26	[AC_TRY_LINK([int *p;], [extern int $v; p = &$v;],	25	[AC_TRY_LINK([int *p;], [extern int $v; p = &$v;],
27	[eval "gnome_cv_var_$v=yes"],	26	[eval "gnome_cv_var_$v=yes"],
28	[eval "gnome_cv_var_$v=no"])])	27	[eval "gnome_cv_var_$v=no"])])
29	if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then	28	if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then
30	AC_MSG_RESULT(yes)	29	AC_MSG_RESULT(yes)
31	n=HAVE_`echo $v \| tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`	30	n=HAVE_`echo $v \| tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
32	AC_DEFINE_UNQUOTED($n)	31	AC_DEFINE_UNQUOTED($n)
33	else	32	else
34	AC_MSG_RESULT(no)	33	AC_MSG_RESULT(no)
35	fi	34	fi
36	done	35	done
		36	AC_REPLACE_FUNCS([memmove mkstemp scandir strcasecmp strerror strndup strnlen])
		37	AC_REPLACE_FUNCS([strtok_r strtod strtol strtoul vasprintf vsnprintf])
37		38
38	AC_REPLACE_FUNCS(memmove mkstemp scandir strcasecmp strerror strndup strnlen)	39	r_path=
39	AC_REPLACE_FUNCS(strtok_r strtod strtol strtoul vasprintf vsnprintf)	40	AC_CHECK_FUNCS(realpath,,r_path="no")
40		41	if test "$r_path" = "no"; then
41	AC_CHECK_FUNCS(realpath,,LIBOBJS="$LIBOBJS canonicalize.o")	42	AC_LIBOBJ(canonicalize)
42		43	fi
43	# to include `error.c' error.c has some HAVE_* checks	44	# to include 'error.c' error.c has some HAVE_* checks
44	AC_CHECK_FUNCS(vprintf doprnt strerror_r)	45	AC_CHECK_FUNCS([vprintf doprnt strerror_r])
45	AM_FUNC_ERROR_AT_LINE	46	AC_FUNC_ERROR_AT_LINE
46		47
47	# This is required if we declare setreuid () and setregid ().	48	# This is required if we declare setreuid () and setregid ().
48	AC_TYPE_UID_T	49	AC_TYPE_UID_T
49		50
50	# see if we need to declare some functions. Solaris is notorious for	51	# see if we need to declare some functions. Solaris is notorious for
51	# putting functions into the `libc' but not listing them in the headers	52	# putting functions into the 'libc' but not listing them in the headers
52	AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h dirent.h)	53	AC_CHECK_HEADERS([string.h strings.h stdlib.h unistd.h dirent.h])
53	GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize)	54	GCC_NEED_DECLARATIONS([gethostname setreuid setregid getpagesize])
54	GCC_NEED_DECLARATION(scandir,[	55	GCC_NEED_DECLARATION(scandir,
55	#ifdef HAVE_DIRENT_H	56	[#ifdef HAVE_DIRENT_H
56	#include <dirent.h>	57	#include <dirent.h>
57	#endif	58	#endif]
58	])	59	)
59
60	# Turn our LIBOBJS into libtool objects. This is gross, but it
61	# requires changes to autoconf before it goes away.
62	LTLIBOBJS=`echo "$LIBOBJS" \| sed 's/\.o/.lo/g'`
63	AC_SUBST(need_gnome_support)	60	AC_SUBST(need_gnome_support)
64	AC_SUBST(LTLIBOBJS)	61	AC_SUBST(LTLIBOBJS)
65		62
66	LIBOBJS="$save_LIBOBJS"	63	AM_CONDITIONAL(BUILD_GNOME_SUPPORT,test "$need_gnome_support" = "yes")
67	AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
68	])	64	])

Lines 5-12 Link Here

(-)gnome-libs-1.4.2/configure.in.orig (-161 / +187 lines)
5	AC_INIT(gnome.h)	5	AC_INIT(gnome.h)
6	AM_CONFIG_HEADER(config.h)	6	AM_CONFIG_HEADER(config.h)
7		7
8	AC_CANONICAL_SYSTEM	8	AC_CANONICAL_TARGET
9		9
		10	AC_ARG_PROGRAM
10	AM_INIT_AUTOMAKE(gnome-libs, 1.4.2)	11	AM_INIT_AUTOMAKE(gnome-libs, 1.4.2)
11		12
12	AM_ACLOCAL_INCLUDE(macros)	13	AM_ACLOCAL_INCLUDE(macros)
Lines 14-29 Link Here
14	AC_ISC_POSIX	15	AC_ISC_POSIX
15	AC_PROG_CC	16	AC_PROG_CC
16	AC_STDC_HEADERS	17	AC_STDC_HEADERS
17	AC_ARG_PROGRAM	18	AC_PROG_LIBTOOL
18
19	AM_PROG_LIBTOOL
20		19
21	AM_MAINTAINER_MODE	20	AM_MAINTAINER_MODE
22		21
23	dnl	22	dnl
24	dnl let applications configure for gnome	23	dnl let applications configure for gnome
25	dnl	24	dnl
26	gnome_cv_use_gnome=yes	25	gnome_cv_use_gnome="yes"
27		26
28	GNOME_COMPILE_WARNINGS	27	GNOME_COMPILE_WARNINGS
29		28
Lines 36-47 Link Here
36	dnl (we want to make sure it matches with the gtk we're using)	35	dnl (we want to make sure it matches with the gtk we're using)
37		36
38	changequote(,)dnl	37	changequote(,)dnl
39	GLIB_CFLAGS=`echo $GTK_CFLAGS \| sed 's/^.\(-I[^ ]glib[^ ]* -I[^ ]\).*$/\1/'`	38	GLIB_CFLAGS=`echo $GTK_CFLAGS \| sed -e 's/^.\(-I[^ ]glib[^ ]* -I[^ ]\).*$/\1/'`
40	GLIB_LDFLAGS=`echo $GTK_LIBS \| sed -e 's/^.-lgdk[^ ] \(-L[^ ]\).$/\1/' -e 's/^. -lgdk[^ ]* .*$//'`	39	GLIB_LDFLAGS=`echo $GTK_LIBS \| \
		40	sed -e 's/^.-lgdk[^ ] \(-L[^ ]\).$/\1/' -e 's/^. -lgdk[^ ]* .*$//'`
41	if test -z "$GLIB_LDFLAGS" ; then	41	if test -z "$GLIB_LDFLAGS" ; then
42	GLIB_LDFLAGS=`echo $GTK_LIBS \| sed -e 's/\(-L[^ ]\) .$/\1/' -e 's/^.\(-L[^ ]\)$/\1/'`	42	GLIB_LDFLAGS=`echo $GTK_LIBS \| sed -e 's/^.\(-L[^ ]\) .*$/\1/'`
43	fi	43	fi
44	GLIB_LIBS="$GLIB_LDFLAGS `echo $GTK_LIBS \| sed 's/^.\(-lglib[^ ]\).*$/\1/'`"	44	GLIB_LIBS=`echo $GTK_LIBS \| sed -e 's/^.\(-lglib[^ ]\).*$/\1/'`
		45	GMODULE_LIBS=`echo $GTK_LIBS \| \
		46	sed -e 's/^.\(-lgmodule[^ ]\).\(-lglib[^ ]\).\(-ldl[^ ]\).*$/\1 \2 \3/'`
45	changequote([,])dnl	47	changequote([,])dnl
46		48
47	AC_SUBST(GLIB_CFLAGS)	49	AC_SUBST(GLIB_CFLAGS)
Lines 58-95 Link Here
58	AC_SUBST(HAVE_GTK_DOC)	60	AC_SUBST(HAVE_GTK_DOC)
59		61
60	dnl Let people disable the gtk-doc stuff.	62	dnl Let people disable the gtk-doc stuff.
61	AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)	63	AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]],[enable_gtk_doc="$enableval"],[enable_gtk_doc="auto"])
62		64
63	if test x$enable_gtk_doc = xauto ; then	65	if test "x$enable_gtk_doc" = "xauto" ; then
64	if test x$GTKDOC = xtrue ; then	66	if test "x$GTKDOC" = "xtrue" ; then
65	enable_gtk_doc=yes	67	enable_gtk_doc="yes"
66	else	68	else
67	enable_gtk_doc=no	69	enable_gtk_doc="no"
68	fi	70	fi
69	fi	71	fi
70		72
71	dnl NOTE: We need to use a separate automake conditional for this	73	dnl NOTE: We need to use a separate automake conditional for this
72	dnl to make this work with the tarballs.	74	dnl to make this work with the tarballs.
73	AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)	75	AM_CONDITIONAL(ENABLE_GTK_DOC, test "x$enable_gtk_doc" = "xyes")
74		76
75		77
76	# We would like indent, but don't require it.	78	# We would like indent, but don't require it.
77	AC_CHECK_PROG(INDENT, indent, indent)	79	AC_CHECK_PROG(INDENT, indent, indent)
78		80
79	_found_perl=0	81	_found_perl="no"
80	if test -n "$PERL" && $PERL -v \| grep 'version 5.' > /dev/null ; then	82	if test -n "$PERL" && $PERL -v \| grep 'version 5.' > /dev/null ; then
81	_found_perl=1	83	_found_perl="yes"
82	else	84	else
83	# The version string for perl changed for 'version 5' to 'v5' in	85	# The version string for perl changed for 'version 5' to 'v5' in
84	# perl 5.6 or therabouts	86	# perl 5.6 or therabouts
85	if test -n "$PERL" && $PERL -v \| grep 'v5.' > /dev/null ; then	87	if test -n "$PERL" && $PERL -v \| grep 'v5.' > /dev/null ; then
86	_found_perl=1	88	_found_perl="yes"
87	fi	89	fi
88
89	fi	90	fi
90		91
91	REBUILD=\#	92	REBUILD=\#
92	if test $_found_perl -eq 1; then	93	if test "$_found_perl" = "yes"; then
93	if test -n "$AWK" ; then	94	if test -n "$AWK" ; then
94	REBUILD=	95	REBUILD=
95	fi	96	fi
Lines 97-111 Link Here
97	AC_SUBST(REBUILD)	98	AC_SUBST(REBUILD)
98		99
99	dnl Utility conditional	100	dnl Utility conditional
100	AM_CONDITIONAL(FALSE, test x = y)	101	AM_CONDITIONAL(FALSE, test "x" = "y")
101		102
102	AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]], enable_debug="$enableval", enable_debug=no)	103	AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],[enable_debug="$enableval"],[enable_debug="no"])
103		104
104	if test x$enable_debug = xyes ; then	105	if test "x$enable_debug" = "xyes"; then
105	AC_DEFINE(GNOME_ENABLE_DEBUG)	106	AC_DEFINE(GNOME_ENABLE_DEBUG)
106	fi	107	fi
107		108
108	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"	109	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"
		110
109	AM_GNOME_GETTEXT	111	AM_GNOME_GETTEXT
110	# AM_GNOME_GETTEXT above substs $DATADIRNAME	112	# AM_GNOME_GETTEXT above substs $DATADIRNAME
111	# this is the directory where the *.{mo,gmo} files are installed	113	# this is the directory where the *.{mo,gmo} files are installed
Lines 115-142 Link Here
115	AC_CHECK_LIB(m, floor)	117	AC_CHECK_LIB(m, floor)
116		118
117	AC_CHECK_HEADERS(dlfcn.h locale.h)	119	AC_CHECK_HEADERS(dlfcn.h locale.h)
118		120	AC_CACHE_CHECK([for gmodule support],ac_cv_gmodule,
119	AC_CACHE_CHECK([for gmodule support], ac_cv_gmodule,[	121	[save_LIBS="$LIBS"
120	save_LDFLAGS="$LDFLAGS"	122	LIBS="$GMODULE_LIBS"
121	LDFLAGS="$LDFLAGS `glib-config --libs gmodule`"	123	AC_TRY_RUN([#include <gmodule.h>
122	AC_TRY_RUN([	124	int main() {
123	#include <gmodule.h>	125	return g_module_supported()==0;
124		126	}],
125	int main()	127	ac_cv_gmodule="yes",
126	{	128	ac_cv_gmodule="no",
127	return g_module_supported() == 0;	129	ac_cv_gmodule="yes"
128	}],ac_cv_gmodule=yes,ac_cv_gmodule=no,ac_cv_gmodule=yes)	130	)
129	LDFLAGS="$save_LDFLAGS"])	131	LIBS="$save_LIBS"]
130	if test $ac_cv_gmodule = no; then	132	)
131	AC_MSG_ERROR([Dynamic linking is not available on this platform. Some apps,	133	if test "$ac_cv_gmodule" = "no"; then
132	like panel, will not run properly.])	134	AC_MSG_ERROR([Dynamic linking is not available on this platform. Some apps, like panel, will not run properly.])
133	fi	135	fi
134		136
135	AC_CHECK_FUNCS(strerror gethostbyname setfsgid setenv putenv strdup)	137	AC_CHECK_FUNCS(strerror gethostbyname setfsgid setenv putenv strdup)
136		138
137	NSL_LIBS=""	139	NSL_LIBS=""
138	if test $ac_cv_func_gethostbyname = no; then	140	if test "$ac_cv_func_gethostbyname" = "no"; then
139	AC_CHECK_LIB(nsl,gethostbyname,NSL_LIBS=-lnsl)	141	AC_CHECK_LIB(nsl,gethostbyname,NSL_LIBS="-lnsl")
140	fi	142	fi
141	AC_SUBST(NSL_LIBS)	143	AC_SUBST(NSL_LIBS)
142	AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)])	144	AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)])
Lines 157-178 Link Here
157	dnl	159	dnl
158	AC_MSG_CHECKING([for sa_len in struct sockaddr])	160	AC_MSG_CHECKING([for sa_len in struct sockaddr])
159	AC_TRY_COMPILE(	161	AC_TRY_COMPILE(
		162	[#include <sys/socket.h>],
		163	[struct sockaddr s; s.sa_len;],
		164	[sa_len_ok="yes"],
		165	[sa_len_ok="no"])
		166	AC_MSG_RESULT($sa_len_ok)
		167	if test "x$sa_len_ok" = "xno"; then
		168	AC_MSG_CHECKING([for sa_len with -D_SOCKADDR_LEN])
		169	xCPPFLAGS="$CPPFLAGS"
		170	CPPFLAGS="$CPPFLAGS -D_SOCKADDR_LEN"
		171	AC_TRY_COMPILE(
160	[#include <sys/socket.h>],	172	[#include <sys/socket.h>],
161	[struct sockaddr s; s.sa_len;],	173	[struct sockaddr s; s.sa_len;],
162	[sa_len_ok=yes],	174	[AC_DEFINE(_SOCKADDR_LEN)
163	[sa_len_ok=no])	175	sa_len_ok="yes"],
164	AC_MSG_RESULT($sa_len_ok)	176	[sa_len_ok="no"])
165	if test x$sa_len_ok = xno; then	177	CPPFLAGS="$xCPPFLAGS"
166	AC_MSG_CHECKING([for sa_len with -D_SOCKADDR_LEN])
167	xCPPFLAGS="$CPPFLAGS"
168	CPPFLAGS="$CPPFLAGS -D_SOCKADDR_LEN"
169	AC_TRY_COMPILE(
170	[#include <sys/socket.h>],
171	[struct sockaddr s; s.sa_len;],
172	[AC_DEFINE(_SOCKADDR_LEN)
173	sa_len_ok=yes],
174	[sa_len_ok=no])
175	CPPFLAGS="$xCPPFLAGS"
176	fi	178	fi
177	AC_MSG_RESULT($sa_len_ok)	179	AC_MSG_RESULT($sa_len_ok)
178		180
Lines 182-198 Link Here
182		184
183	AC_MSG_CHECKING([for Unix98 sendmsg])	185	AC_MSG_CHECKING([for Unix98 sendmsg])
184	AC_TRY_LINK([	186	AC_TRY_LINK([
185	#include <stdio.h>	187	#include <stdio.h>
186	#include <sys/types.h>	188	#include <sys/types.h>
187	#include <sys/socket.h>	189	#include <sys/socket.h>
188	],[	190	],[struct msghdr hdr;
189	struct msghdr hdr;	191	hdr.msg_control = NULL;
190	hdr.msg_control = NULL;	192	hdr.msg_controllen = 0;
191	hdr.msg_controllen = 0;	193	sendmsg (0, &hdr, 0);],
192	sendmsg (0, &hdr, 0);	194	[AC_DEFINE(HAVE_SENDMSG)
193	],[	195	AC_MSG_RESULT(yes)],
194	AC_DEFINE(HAVE_SENDMSG)	196	[AC_MSG_RESULT(no)]
195	AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])	197	)
196		198
197	AC_CHECK_UTMP	199	AC_CHECK_UTMP
198	AC_CHECK_LASTLOG	200	AC_CHECK_LASTLOG
Lines 200-212 Link Here
200	AC_CHECK_HEADERS(pty.h util.h libutil.h ttyent.h)	202	AC_CHECK_HEADERS(pty.h util.h libutil.h ttyent.h)
201		203
202	AC_CHECK_LIB(util, openpty,	204	AC_CHECK_LIB(util, openpty,
203	[	205	[AC_CHECK_LIB(util, login_tty,[AC_DEFINE(HAVE_LOGIN_TTY)])
204	AC_CHECK_LIB(util, login_tty, [AC_DEFINE(HAVE_LOGIN_TTY)])
205	AC_DEFINE(HAVE_OPENPTY)	206	AC_DEFINE(HAVE_OPENPTY)
206	AC_DEFINE(HAVE_LIBUTIL)	207	AC_DEFINE(HAVE_LIBUTIL)
207	UTIL_LIBS="-lutil"	208	UTIL_LIBS="-lutil"
208	AC_SUBST(UTIL_LIBS)	209	AC_SUBST(UTIL_LIBS)]
209	])	210	)
210		211
211	AC_CHECK_FUNCS(grantpt utmpxname utmpname getutmpx getutent getttyent)	212	AC_CHECK_FUNCS(grantpt utmpxname utmpname getutmpx getutent getttyent)
212	AC_CHECK_FUNCS(updwtmpx updwtmp fcntl flock strrchr seteuid setreuid)	213	AC_CHECK_FUNCS(updwtmpx updwtmp fcntl flock strrchr seteuid setreuid)
Lines 214-223 Link Here
214	AC_CHECK_HEADERS(stropts.h)	215	AC_CHECK_HEADERS(stropts.h)
215		216
216	dnl And workaround for a Autoconf 2.4 bug:	217	dnl And workaround for a Autoconf 2.4 bug:
217	if test x$ac_cv_func_grantpt = xyes; then	218	if test "x$ac_cv_func_grantpt" = "xyes"; then
218	:	219	:
219	else	220	else
220	AC_CHECK_LIB(pt, grantpt)	221	AC_CHECK_LIB(pt, grantpt)
221	fi	222	fi
222		223
223	dnl	224	dnl
Lines 227-301 Link Here
227		228
228	dnl Test for libz	229	dnl Test for libz
229	AC_CHECK_LIB(z, inflate,	230	AC_CHECK_LIB(z, inflate,
230	AC_CHECK_HEADER(zlib.h,	231	[AC_CHECK_LIB(z, compress,
231	Z_LIBS="-lz"; AC_DEFINE(HAVE_LIBZ)))	232	[AC_CHECK_HEADER(zlib.h,
232	AC_CHECK_LIB(z, compress, ,	233	Z_LIBS="-lz"
233	AC_MSG_ERROR([[	234	AC_DEFINE(HAVE_LIBZ),
		235	AC_MSG_ERROR([** LIBZ header file not found *])
		236	)]
		237	)],
		238	AC_MSG_ERROR([[
234	*** Incorrect libz version found. Please make sure you do not have	239	*** Incorrect libz version found. Please make sure you do not have
235	*** an outdated libz.a or libz.so hiding in your X11 distribution or	240	*** an outdated libz.a or libz.so hiding in your X11 distribution or
236	*** elsewhere on your system. Versions of libz with the "compress" and	241	*** elsewhere on your system. Versions of libz with the "compress" and
237	*** "uncompress" symbols are sufficiently recent to build GNOME.]]))	242	*** "uncompress" symbols are sufficiently recent to build GNOME.]])
		243	)
238		244
239	dnl Test for libjpeg	245	dnl Test for libjpeg
240	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,	246	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
241	jpeg_ok=yes,	247	[AC_CHECK_HEADER(jpeglib.h,
242	jpeg_ok=no)	248	JPEG_LIBS="-ljpeg"
243	if test "$jpeg_ok" = yes; then	249	AC_DEFINE(HAVE_LIBJPEG)
244	AC_MSG_CHECKING([for jpeglib.h])	250	)]
245	AC_TRY_CPP(	251	)
246	[#include <stdio.h>	252	dnl AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
247	#undef PACKAGE	253	dnl jpeg_ok="yes",
248	#undef VERSION	254	dnl jpeg_ok="no")
249	/* AAARGH!!! jpeglib.h defines HAVE_STDLIB_H. */	255	dnl if test "$jpeg_ok" = "yes"; then
250	#undef HAVE_STDDEF_H	256	dnl AC_MSG_CHECKING([for jpeglib.h])
251	#undef HAVE_STDLIB_H	257	dnl AC_TRY_CPP([#include <stdio.h>
252	#include <jpeglib.h>],	258	dnl #undef PACKAGE
253	jpeg_ok=yes,	259	dnl #undef VERSION
254	jpeg_ok=no)	260	dnl /* AAARGH!!! jpeglib.h defines HAVE_STDLIB_H.*/
255	AC_MSG_RESULT($jpeg_ok)	261	dnl #undef HAVE_STDDEF_H
256	if test "$jpeg_ok" = yes; then	262	dnl #undef HAVE_STDLIB_H
257	JPEG_LIBS="-ljpeg"; AC_DEFINE(HAVE_LIBJPEG)	263	dnl #include <jpeglib.h>
258	fi	264	dnl ],jpeg_ok="yes",
259	fi	265	dnl jpeg_ok="no")
		266	dnl AC_MSG_RESULT($jpeg_ok)
		267	dnl if test "$jpeg_ok" = "yes"; then
		268	dnl JPEG_LIBS="-ljpeg"
		269	dnl AC_DEFINE(HAVE_LIBJPEG)
		270	dnl fi
		271	dnl fi
260		272
261	dnl Test for libtiff	273	dnl Test for libtiff
262	AC_CHECK_LIB(tiff, TIFFReadScanline,	274	AC_CHECK_LIB(tiff, TIFFReadScanline,
263	AC_CHECK_HEADER(tiffio.h,	275	[AC_CHECK_HEADER(tiffio.h,
264	TIFF_LIBS="-ltiff"; AC_DEFINE(HAVE_LIBTIFF)),	276	TIFF_LIBS="-ltiff"
265	AC_CHECK_LIB(tiff, TIFFWriteScanline,	277	AC_DEFINE(HAVE_LIBTIFF))],
266	AC_CHECK_HEADER(tiffio.h,	278	[AC_CHECK_LIB(tiff, TIFFWriteScanline,
267	TIFF_LIBS="-ltiff $JPEG_LIBS $Z_LIBS"; AC_DEFINE(HAVE_LIBTIFF)),	279	[AC_CHECK_HEADER(tiffio.h,
268	AC_CHECK_LIB(tiff34, TIFFFlushData,	280	TIFF_LIBS="-ltiff $JPEG_LIBS $Z_LIBS"
269	AC_CHECK_HEADER(tiffio.h,	281	AC_DEFINE(HAVE_LIBTIFF))],
270	TIFF_LIBS="-ltiff34 $JPEG_LIBS $Z_LIBS"; AC_DEFINE(HAVE_LIBTIFF)),,	282	[AC_CHECK_LIB(tiff34, TIFFFlushData,
271	$JPEG_LIBS $Z_LIBS -lm), $JPEG_LIBS $Z_LIBS -lm), -lm)	283	[AC_CHECK_HEADER(tiffio.h,
		284	TIFF_LIBS="-ltiff34 $JPEG_LIBS $Z_LIBS"
		285	AC_DEFINE(HAVE_LIBTIFF))],,
		286	$JPEG_LIBS $Z_LIBS -lm)],
		287	$JPEG_LIBS $Z_LIBS -lm)],
		288	-lm)
272		289
273	dnl Test for libgif	290	dnl Test for libgif
274	AC_CHECK_LIB(gif, DGifOpenFileName,	291	AC_CHECK_LIB(gif, DGifOpenFileName,
275	AC_CHECK_HEADER(gif_lib.h,	292	[AC_CHECK_HEADER(gif_lib.h,
276	GIF_LIBS="-lgif"; AC_DEFINE(HAVE_LIBGIF)),,$GTK_LIBS)	293	GIF_LIBS="-lgif"
		294	AC_DEFINE(HAVE_LIBGIF))],,
		295	$GTK_LIBS
		296	)
277		297
278	dnl Test for libungif	298	dnl Test for libungif
279	AC_CHECK_LIB(ungif, DGifOpenFileName,	299	AC_CHECK_LIB(ungif, DGifOpenFileName,
280	AC_CHECK_HEADER(gif_lib.h,	300	[AC_CHECK_HEADER(gif_lib.h,
281	GIF_LIBS="-lungif"; AC_DEFINE(HAVE_LIBGIF)),,$GTK_LIBS)	301	GIF_LIBS="-lungif"
		302	AC_DEFINE(HAVE_LIBGIF))],,
		303	$GTK_LIBS
		304	)
282		305
283	dnl Test for libpng	306	dnl Test for libpng
284	AC_CHECK_LIB(png, png_read_info,	307	AC_CHECK_LIB(png, png_read_info,
285	AC_CHECK_HEADER(png.h,	308	[AC_CHECK_HEADER(png.h,
286	png_ok=yes,	309	png_ok="yes",
287	png_ok=no),,$Z_LIBS -lm)	310	png_ok="no")],,
288	if test "$png_ok" = yes; then	311	$Z_LIBS -lm
		312	)
		313	if test "$png_ok" = "yes"; then
289	AC_MSG_CHECKING([for png_structp in png.h])	314	AC_MSG_CHECKING([for png_structp in png.h])
290	AC_TRY_COMPILE([#include <png.h>],	315	AC_TRY_COMPILE([#include <png.h>
291	[png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct	316	],[png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
292	;],	317	png_ok="yes",
293	png_ok=yes,	318	png_ok="no")
294	png_ok=no)	319	AC_CHECK_LIB(png, png_get_IHDR,
295	AC_CHECK_LIB(png, png_get_IHDR,	320	png_ok="yes",
296	png_ok=yes,png_ok=no)	321	png_ok="no")
297	AC_MSG_RESULT($png_ok)	322	AC_MSG_RESULT($png_ok)
298	if test "$png_ok" = yes; then	323	if test "$png_ok" = "yes"; then
299	PNG_LIBS="-lpng $Z_LIBS"; AC_DEFINE(HAVE_LIBPNG)	324	PNG_LIBS="-lpng $Z_LIBS"; AC_DEFINE(HAVE_LIBPNG)
300	fi	325	fi
301	fi	326	fi
Lines 305-352 Link Here
305	AC_CHECK_HEADERS(utime.h)	330	AC_CHECK_HEADERS(utime.h)
306	AC_FUNC_MMAP	331	AC_FUNC_MMAP
307		332
308	AC_ARG_ENABLE(prefer-db1, [ --enable-prefer-db1 Prefer Berkeley DB 1.x] [default=no]],[prefer_db1="$enableval"],[prefer_db1=no])	333	AC_ARG_ENABLE(prefer-db1, [ --enable-prefer-db1 Prefer Berkeley DB 1.x] [default=no]],
		334	[prefer_db1="$enableval"],[prefer_db1="no"])
309	dnl	335	dnl
310	dnl Check for db stuff (gnome-metadata)	336	dnl Check for db stuff (gnome-metadata)
311	dnl	337	dnl
312	DB_LIB=	338	DB_LIB=
313	AC_CHECK_FUNC(dbopen, [],	339	AC_CHECK_FUNC(dbopen, [],
314	if test "$prefer_db1" = "yes"; then	340	[if test "$prefer_db1" = "yes"; then
315	AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1",	341	AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1",
316	AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb",	342	[AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb",
317	AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3",	343	[AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3",
318	AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4",	344	[AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4",
319	AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])	345	AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
		346	)]
		347	)]
		348	)]
320	)	349	)
321	)	350	else
322	)	351	AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb",
323	)	352	[AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1",
324	else	353	[AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3",
325	AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb",	354	[AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4",
326	AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1",	355	AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
327	AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3",	356	)]
328	AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4",	357	)]
329	AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])	358	)]
330	)	359	)
331	)	360	fi]
332	)
333	)
334	fi
335	)	361	)
336		362
337	dnl look for db headers	363	dnl look for db headers
338	if test "$prefer_db1" = "yes"; then	364	if test "$prefer_db1" = "yes"; then
339	AC_CHECK_HEADERS(db_185.h db1/db.h)	365	AC_CHECK_HEADERS(db_185.h db1/db.h)
340	if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nono; then	366	if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = "nono"; then
341	AC_MSG_ERROR([Berkeley db library required for Gnome])	367	AC_MSG_ERROR([Berkeley db library required for Gnome])
342	fi	368	fi
343	AC_DEFINE(PREFER_DB1)	369	AC_DEFINE(PREFER_DB1)
344	else	370	else
345	AC_CHECK_HEADERS(db.h db_185.h db1/db.h)	371	AC_CHECK_HEADERS(db.h db_185.h db1/db.h)
346		372
347	if test "$ac_cv_header_db_h$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nonono; then	373	if test "$ac_cv_header_db_h$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = "nonono"; then
348	AC_MSG_ERROR([Berkeley db library required for Gnome])	374	AC_MSG_ERROR([Berkeley db library required for Gnome])
349	fi	375	fi
350	fi	376	fi
351		377
352	dnl	378	dnl
Lines 356-368 Link Here
356	AC_PATH_X	382	AC_PATH_X
357	AC_PATH_XTRA	383	AC_PATH_XTRA
358		384
359	AM_PATH_GDK_IMLIB(1.9, [define_imlib_1_9=true],[	385	AM_PATH_GDK_IMLIB(1.9,[define_imlib_1_9="true"],
360	AM_PATH_GDK_IMLIB(1.8,[	386	[AM_PATH_GDK_IMLIB(1.8,
361	LIBGNOMEUI_LIBS="$LIBGNOMEUI_LIBS $PNG_LIBS"	387	[LIBGNOMEUI_LIBS="$LIBGNOMEUI_LIBS $PNG_LIBS"],
362	],[AC_MSG_ERROR([* IMLIB 1.8 not installed - please install first *])])])	388	[AC_MSG_ERROR([* IMLIB 1.8 not installed - please install first *])]
363		389	)]
364		390	)
365	if test x$define_imlib_1_9 = xtrue; then	391	if test "x$define_imlib_1_9" = "xtrue"; then
366	AC_DEFINE(HAVE_IMLIB_1_9)	392	AC_DEFINE(HAVE_IMLIB_1_9)
367	fi	393	fi
368		394
Lines 406-413 Link Here
406	dnl test-gnome	432	dnl test-gnome
407	dnl	433	dnl
408		434
409	AC_ARG_ENABLE(test-gnome, [ --enable-test-gnome compile the test-gnome examples [default=yes]],[compile_test_gnome="$enableval"],[compile_test_gnome=yes])	435	AC_ARG_ENABLE(test-gnome, [ --enable-test-gnome compile the test-gnome examples [default=yes]],
410	AM_CONDITIONAL(COMPILE_TEST_GNOME, test x$compile_test_gnome = xyes)	436	[compile_test_gnome="$enableval"],[compile_test_gnome="yes"])
		437	AM_CONDITIONAL(COMPILE_TEST_GNOME, test "x$compile_test_gnome" = "xyes")
411		438
412	dnl AC_CONFIG_SUBDIRS(libgtktty)	439	dnl AC_CONFIG_SUBDIRS(libgtktty)
413		440
Lines 429-435 Link Here
429	dnl	456	dnl
430	AC_ARG_WITH(kde-datadir, [ --with-kde-datadir=DIR Location of KDE data])	457	AC_ARG_WITH(kde-datadir, [ --with-kde-datadir=DIR Location of KDE data])
431		458
432	if test "x$with_kde_datadir" = x ; then	459	if test "x$with_kde_datadir" = "x"; then
433	kde_datadir=/usr/share	460	kde_datadir=/usr/share
434	else	461	else
435	kde_datadir=$with_kde_datadir	462	kde_datadir=$with_kde_datadir
Lines 453-459 Link Here
453	AC_SUBST(GNOME_IDLDIR)	480	AC_SUBST(GNOME_IDLDIR)
454	AC_SUBST(LIBSUPPORT)	481	AC_SUBST(LIBSUPPORT)
455	AC_SUBST(SUPPORTINCS)	482	AC_SUBST(SUPPORTINCS)
456
457	AC_SUBST(LIBGNOME_LIBS)	483	AC_SUBST(LIBGNOME_LIBS)
458	AC_SUBST(LIBGNOMEUI_LIBS)	484	AC_SUBST(LIBGNOMEUI_LIBS)
459	AC_SUBST(LIBGTKXMHTML_LIBS)	485	AC_SUBST(LIBGTKXMHTML_LIBS)

Lines 80-86 Link Here

(-)gnome-libs-1.4.2/libgnorba/Makefile.am.orig (-1 / +10 lines)
80	Table.h	80	Table.h
81		81
82	libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir)	82	libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir)
83	libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm	83
		84	libgnorba_la_LIBADD = \
		85	$(ORBIT_LIBS) $(GLIB_LIBS) \
		86	$(top_builddir)/libgnome/libgnome.la \
		87	$(top_builddir)/libgnomeui/libgnomeui.la \
		88	$(top_builddir)/libart_lgpl/libart_lgpl.la \
		89	-lpopt -lm
		90
		91
		92	libgnorbagtk_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS)
84		93
85	loadshlib_SOURCES = loadshlib.c	94	loadshlib_SOURCES = loadshlib.c
86		95