+2001-04-14 Martin Baulig <baulig@suse.de>
+
+ * gnome-common.pc.in, gnome-common-2.0.pc.in: Removed.
+
+ * configure.in: Set version number to 1.2.2.
+ (--enable-platform-gnome-2): Removed this command line argument;
+ this package is now the same for GNOME 1.x and GNOME 2.0.
+
+ * acinclude.m4: Removed.
+ * acconfig.h: Removed.
+
+ * support/: We don't build this directory anymore; the GNOME 1.x
+ version of it is in gnome-libs/support and the GNOME 2.0 one is in
+ libgnomebase/libgnomesupport.
+
2001-03-26 Robin * Slomkowski <rslomkow@eazel.com>
* Makefile.am: added gnome-common.spec.in to EXTRA_DISTS
+++ /dev/null
-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 <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)
-
- LIBOBJS="$save_LIBOBJS"
- AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
-])
-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 <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#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
-]
-)
-AC_INIT(support/easy-vsnprintf.c)
+AC_INIT(macros2/gnome-pkgconfig.m4)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gnome-common, 1.2.1)
+AM_INIT_AUTOMAKE(gnome-common, 1.2.2)
AM_MAINTAINER_MODE
AM_CONDITIONAL(INSIDE_GNOME_COMMON, true)
-AC_ARG_ENABLE(platform-gnome-2, [ --enable-platform-gnome-2 enable GNOME 2.x platform [default=no]],[platform_gnome_2="$enableval"],[platform_gnome_2=no])
-if test "x$platform_gnome_2" != "xyes" ; then
- platform_gnome_2=no
-fi
-
-AM_CONDITIONAL(PLATFORM_GNOME_2, test $platform_gnome_2 = yes)
-
AC_DEFUN([AC_FYI], [echo "FYI: " $1])
AC_ISC_POSIX
AC_PROG_AWK
-if test $platform_gnome_2 = yes; then
- GNOME_INTERFACE_VERSION=2
- AC_FYI(Enabling GNOME 2 Platform)
- AC_PATH_PROG(PKG_CONFIG, pkg-config)
- if ! test -x "$PKG_CONFIG" ; then
- AC_MSG_ERROR([
+AC_PATH_PROG(PKG_CONFIG, pkg-config)
+if ! test -x "$PKG_CONFIG" ; then
+ AC_MSG_ERROR([
*** You need the latest pkg-config.
*** Get the latest version of pkg-config from
*** http://pkgconfig.sourceforce.net.])
- fi
- AC_SUBST(PKG_CONFIG)
- GNOME_SUPPORT_CHECKS
-else
- GNOME_INTERFACE_VERSION=1
fi
-AC_SUBST(GNOME_INTERFACE_VERSION)
+AC_SUBST(PKG_CONFIG)
AC_OUTPUT([
-gnome-common.pc
-gnome-common-2.0.pc
Makefile
gnome-common.spec
macros/Makefile
macros2/Makefile
bin/Makefile
-doc/Makefile
-support/Makefile
-support/gnome-support-2.0.pc])
+doc/Makefile])
projects / platform / upstream / gnome-common.git / commitdiff