diff options
| author | Laszlo Peter <laca@ireland.sun.com> | 2001-06-29 14:36:17 +0000 |
|---|---|---|
| committer | László PÉTER <laca@src.gnome.org> | 2001-06-29 14:36:17 +0000 |
| commit | 607a53393521d00c59f451341f2e81fa49cb392e (patch) | |
| tree | 88660fc47af6158ab7117c0f51d8dab375223595 | |
| parent | e67857422148467c9d6c85545f5803e99a2e871f (diff) | |
| download | shared-mime-info-607a53393521d00c59f451341f2e81fa49cb392e.tar.gz | |
Fix the regexp to process all 6 version numbers.
2001-06-29 Laszlo Peter <laca@ireland.sun.com>
* gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Fix the regexp
to process all 6 version numbers.
svn path=/trunk/; revision=1837
| -rw-r--r-- | macros2/ChangeLog | 5 | ||||
| -rw-r--r-- | macros2/gnome-pkgconfig.m4 | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index d09a271c..45afd423 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,8 @@ +2001-06-29 Laszlo Peter <laca@ireland.sun.com> + + * gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Fix the regexp + to process all 6 version numbers. + 2001-06-22 Elliot Lee <sopwith@redhat.com> * gnome-gettext.m4: N'sync with the gnome1 version, bye bye buggies. diff --git a/macros2/gnome-pkgconfig.m4 b/macros2/gnome-pkgconfig.m4 index 11621fba..550b3b80 100644 --- a/macros2/gnome-pkgconfig.m4 +++ b/macros2/gnome-pkgconfig.m4 @@ -6,10 +6,10 @@ dnl to the corresponding number of required-version. dnl GNOME_PKGCONFIG_CHECK_VERSION(given-version, required-version [, match-action] [, else-action]) AC_DEFUN([GNOME_PKGCONFIG_CHECK_VERSION],[ [eval `echo "$1:0:0:0:0:0:0" | sed -e 's/^[^0-9]*//' -e 's/[^0-9]\+/:/g' \ - -e 's/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):.*/ac_v1=\1 ac_v2=\2 ac_v3=\3 ac_v4=\4 ac_v5=\5 ac_v6=\6/' \ + -e 's/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):.*/ac_v1=\1 ac_v2=\2 ac_v3=\3 ac_v4=\4 ac_v5=\5 ac_v6=\6/' \ `] [eval `echo "$2:0:0:0:0:0:0" | sed -e 's/^[^0-9]*//' -e 's/[^0-9]\+/:/g' \ - -e 's/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):.*/ac_r1=\1 ac_r2=\2 ac_r3=\3 ac_r4=\4 ac_r5=\5 ac_r6=\6/' \ + -e 's/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):.*/ac_r1=\1 ac_r2=\2 ac_r3=\3 ac_r4=\4 ac_r5=\5 ac_r6=\6/' \ `] ac_vm=[`expr \( $ac_v1 \> $ac_r1 \) \| \( \( $ac_v1 \= $ac_r1 \) \& \( \ \( $ac_v2 \> $ac_r2 \) \| \( \( $ac_v2 \= $ac_r2 \) \& \( \ |