diff options
| author | Martin Baulig <martin@home-of-linux.org> | 2000-11-22 12:06:00 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2000-11-22 12:06:00 +0000 |
| commit | b029394f188d8ee30d1d7e31edcaeb226c01e144 (patch) | |
| tree | e621976f16f33af25444a0e24f7f6797c3ab41a3 | |
| parent | b703777a7de0dbda8ee8e186394424dbd6486572 (diff) | |
| download | gnome-common-b029394f188d8ee30d1d7e31edcaeb226c01e144.tar.gz | |
New file. This defines GNOME_PLATFORM_GNOME_2.
2000-11-22 Martin Baulig <martin@home-of-linux.org>
* gnome-platform.m4: New file. This defines
GNOME_PLATFORM_GNOME_2.
* gnome-pkgconfig.m4: Disable the --extra-flags argument to
pkg-config, this doesn't exist anymore.
svn path=/trunk/; revision=1470
| -rw-r--r-- | macros2/ChangeLog | 8 | ||||
| -rw-r--r-- | macros2/Makefile.am | 2 | ||||
| -rw-r--r-- | macros2/gnome-pkgconfig.m4 | 6 | ||||
| -rw-r--r-- | macros2/gnome-platform.m4 | 34 |
4 files changed, 43 insertions, 7 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index 0f9ceb4..35d7422 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,5 +1,13 @@ 2000-11-22 Martin Baulig <martin@home-of-linux.org> + * gnome-platform.m4: New file. This defines + GNOME_PLATFORM_GNOME_2. + + * gnome-pkgconfig.m4: Disable the --extra-flags argument to + pkg-config, this doesn't exist anymore. + +2000-11-22 Martin Baulig <martin@home-of-linux.org> + * gnome-pkgconfig.m4: New file. This defines GNOME_CHECK_PKGCONFIG, GNOME_REQUIRE_PKGCONFIG and GNOME_PKGCONFIG_* macros from pkg-config. diff --git a/macros2/Makefile.am b/macros2/Makefile.am index 1f384d0..73729ad 100644 --- a/macros2/Makefile.am +++ b/macros2/Makefile.am @@ -4,7 +4,7 @@ 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-x-checks.m4 gnome.m4 linger.m4 \ - check-utmp.m4 gnome-pkgconfig.m4 + check-utmp.m4 gnome-pkgconfig.m4 gnome-platform.m4 EXTRA_DIST=$(GNOME2_MACROS) autogen.sh MAINTAINERCLEANFILES=macros2.dep diff --git a/macros2/gnome-pkgconfig.m4 b/macros2/gnome-pkgconfig.m4 index 93d7f6c..1902276 100644 --- a/macros2/gnome-pkgconfig.m4 +++ b/macros2/gnome-pkgconfig.m4 @@ -157,10 +157,4 @@ AC_DEFUN(GNOME_PKGCONFIG_CHECK_MODULES, eval $name'_DEPENDS'=\"$pkg_list\" fi fi - pkg_varlist=`$PKG_CONFIG --extra-flags $pkg_list` - if test -n "$pkg_varlist"; then - for pkgvar in $pkg_varlist; do - eval ${name}'_'${pkgvar}=\"`$PKG_CONFIG --get-flag $pkgvar $pkg_list`\" - done - fi ]) diff --git a/macros2/gnome-platform.m4 b/macros2/gnome-platform.m4 new file mode 100644 index 0000000..649eb27 --- /dev/null +++ b/macros2/gnome-platform.m4 @@ -0,0 +1,34 @@ +dnl +dnl GNOME_PLATFORM_GNOME_2(default, [force]) +dnl +dnl If the first parameter is `yes', then the default is +dnl the GNOME 2.x platform, otherwise the GNOME 1.x one. +dnl +dnl If the optional second parameter is `force', then use +dnl the default value without command line argument. +dnl + +AC_DEFUN([GNOME_PLATFORM_GNOME_2],[ + if test x$1 = xyes ; then + platform_gnome_2_default=yes + else + platform_gnome_2_default=no + fi + if test x$2 = xforce ; then + platform_gnome_2="$platform_gnome_2_default"; + else + AC_ARG_ENABLE(platform-gnome-2, [ --enable-platform-gnome-2 enable GNOME 2.x platform [default=no]],[platform_gnome_2="$enableval"],[platform_gnome_2="$platform_gnome_2_default"]) + fi + + AM_CONDITIONAL(PLATFORM_GNOME_2, test $platform_gnome_2 = yes) + + AC_MSG_CHECKING(for GNOME Platform) + if test $platform_gnome_2 = yes; then + AC_MSG_RESULT(GNOME 2.x) + GNOME_INTERFACE_VERSION=2 + else + AC_MSG_RESULT(GNOME 1.x) + GNOME_INTERFACE_VERSION=1 + fi + AC_SUBST(GNOME_INTERFACE_VERSION) +]) |