diff options
| author | Martin Baulig <baulig@suse.de> | 2001-04-14 18:48:46 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2001-04-14 18:48:46 +0000 |
| commit | 06b6d96d6f6029693b4df35000edcb4a42b3f72a (patch) | |
| tree | 697a01bfea80d987c6723e6f5eed2cf0ac3e9e61 /configure.in | |
| parent | a8eff2c2860b677e15b2e24cede9a437484b1daa (diff) | |
| download | shared-mime-info-06b6d96d6f6029693b4df35000edcb4a42b3f72a.tar.gz | |
Removed.
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.
svn path=/trunk/; revision=1660
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/configure.in b/configure.in index 5e78c7e8..528c663b 100644 --- a/configure.in +++ b/configure.in @@ -1,19 +1,11 @@ -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 @@ -25,32 +17,20 @@ AM_PROG_LIBTOOL 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]) |