From d7074908eaabf0016b3c675346f6eafb647db9c6 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Tue, 21 Nov 2000 17:11:10 +0000 Subject: [PATCH] Removed. 2000-11-21 Martin Baulig * gnome-support.m4, need-declaration.m4: Removed. svn path=/trunk/; revision=1464 --- macros2/ChangeLog | 4 +++ macros2/Makefile.am | 7 ++--- macros2/gnome-support.m4 | 68 --------------------------------------------- macros2/need-declaration.m4 | 42 ---------------------------- 4 files changed, 7 insertions(+), 114 deletions(-) delete mode 100644 macros2/gnome-support.m4 delete mode 100644 macros2/need-declaration.m4 diff --git a/macros2/ChangeLog b/macros2/ChangeLog index d4eb867..202974e 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,7 @@ +2000-11-21 Martin Baulig + + * gnome-support.m4, need-declaration.m4: Removed. + 2000-09-30 Martin Baulig * gnome-x-checks.m4: Switch to pkg-config to check for GTK+ 2.0; diff --git a/macros2/Makefile.am b/macros2/Makefile.am index d5f625d..1a56948 100644 --- a/macros2/Makefile.am +++ b/macros2/Makefile.am @@ -3,21 +3,20 @@ GNOME2_MACROS= \ compiler-flags.m4 gnome-common.m4 gnome-cxx-check.m4 \ gnome-fileutils.m4 gnome-gettext.m4 gnome-gnorba-check.m4 \ - gnome-pthread-check.m4 gnome-support.m4 \ - gnome-x-checks.m4 gnome.m4 linger.m4 need-declaration.m4 \ + gnome-pthread-check.m4 gnome-x-checks.m4 gnome.m4 linger.m4 \ check-utmp.m4 EXTRA_DIST=$(GNOME2_MACROS) autogen.sh MAINTAINERCLEANFILES=macros2.dep @MAINT@macros2.dep: Makefile.am -@MAINT@ @echo '$$(top_srcdir)/aclocal.m4: $(GNOME2_MACROS:%=hack-macros/%)' > $@ +@MAINT@ @echo '$$(top_srcdir)/aclocal.m4: $(GNOME2_MACROS:%=macros2/%)' > $@ if INSIDE_GNOME_COMMON gnome2_aclocaldir = $(datadir)/aclocal/gnome2-macros gnome2-macros.dep: Makefile.am - @echo '$$(top_srcdir)/aclocal.m4: $(GNOME2_MACROS:%=$(gnome_aclocaldir)/%)' > $@ + @echo '$$(top_srcdir)/aclocal.m4: $(GNOME2_MACROS:%=$(gnome2_aclocaldir)/%)' > $@ gnome2_aclocal_DATA = $(GNOME2_MACROS) autogen.sh gnome2-macros.dep diff --git a/macros2/gnome-support.m4 b/macros2/gnome-support.m4 deleted file mode 100644 index 2c1d049..0000000 --- a/macros2/gnome-support.m4 +++ /dev/null @@ -1,68 +0,0 @@ -dnl GNOME_SUPPORT_CHECKS -dnl Check for various support functions needed by the standard -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]) - - # 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' - 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) - - 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 - - # 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 -#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) - - LIBOBJS="$save_LIBOBJS" - AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes) -]) diff --git a/macros2/need-declaration.m4 b/macros2/need-declaration.m4 deleted file mode 100644 index d5b7bc6..0000000 --- a/macros2/need-declaration.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl See whether we need a declaration for a function. -dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES]) -AC_DEFUN(GCC_NEED_DECLARATION, -[AC_MSG_CHECKING([whether $1 must be declared]) -AC_CACHE_VAL(gcc_cv_decl_needed_$1, -[AC_TRY_COMPILE([ -#include -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_UNISTD_H -#include -#endif -$2], -[char *(*pfn) = (char *(*)) $1], -eval "gcc_cv_decl_needed_$1=no", eval "gcc_cv_decl_needed_$1=yes")]) -if eval "test \"`echo '$gcc_cv_decl_needed_'$1`\" = yes"; then - AC_MSG_RESULT(yes) - gcc_need_declarations="$gcc_need_declarations $1" - gcc_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - AC_DEFINE_UNQUOTED($gcc_tr_decl) -else - AC_MSG_RESULT(no) -fi -])dnl - -dnl Check multiple functions to see whether each needs a declaration. -dnl GCC_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES]) -AC_DEFUN(GCC_NEED_DECLARATIONS, -[for ac_func in $1 -do -GCC_NEED_DECLARATION($ac_func, $2) -done -] -) -- 2.7.4