diff options
| author | Elliot Lee <sopwith@src.gnome.org> | 1999-11-18 00:34:20 +0000 |
|---|---|---|
| committer | Elliot Lee <sopwith@src.gnome.org> | 1999-11-18 00:34:20 +0000 |
| commit | 14c19621f3b5265475d4d78d30ca971da5f5bfc9 (patch) | |
| tree | 6baa81bb4dbdd7a4bc42a1f5d25ed9294df13299 | |
| parent | 393765887663d0cc72fac9ef4dd007fea84223ba (diff) | |
| download | gnome-common-14c19621f3b5265475d4d78d30ca971da5f5bfc9.tar.gz | |
Fix makeenums.pl so it really truly reads the files, and its results.
Fix makeenums.pl so it really truly reads the files, and its results.
Apply patch from Iain for gnome_program_init.
Fix gnome-helpsys.h to be parseable by makeenums.pl
svn path=/trunk/; revision=1000
| -rw-r--r-- | hack-macros/gnome.m4 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/hack-macros/gnome.m4 b/hack-macros/gnome.m4 index 3866eb5..98312a3 100644 --- a/hack-macros/gnome.m4 +++ b/hack-macros/gnome.m4 @@ -36,17 +36,17 @@ AC_ARG_ENABLE(gnometest, [ --disable-gnometest Do not try to compile and GNOMEUI_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnomeui`" gnome_config_major_version=`$GNOME_CONFIG $gnome_config_args --version | \ - sed 's/[^0-9]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` + sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` gnome_config_minor_version=`$GNOME_CONFIG $gnome_config_args --version | \ - sed 's/[^0-9]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` + sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` gnome_config_micro_version=`$GNOME_CONFIG $gnome_config_args --version | \ - sed 's/[^0-9]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` + sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` needed_major_version=`echo $min_gnome_version | \ - sed 's/[^0-9]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` + sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` needed_minor_version=`echo $min_gnome_version | \ - sed 's/[^0-9]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` + sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` needed_micro_version=`echo $min_gnome_version | \ - sed 's/[^0-9]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` + sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` if test $gnome_config_major_version -lt $needed_major_version; then ifelse([$3], , :, [$3]) @@ -79,6 +79,7 @@ AC_ARG_ENABLE(gnometest, [ --disable-gnometest Do not try to compile and echo "*** your path, or set the GNOME_CONFIG environment variable to the" echo "*** full path to gnome-config." else + : fi GNOME_CFLAGS="" GNOME_LIBS="" |