[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/arts
From:       George Staikos <staikos () kde ! org>
Date:       2003-03-19 4:42:33
[Download RAW message or body]

CVS commit by staikos: 

make it support both arts 1.1.x and arts 1.2.x


  M +9 -6      configure.in.in   1.73


--- kdelibs/arts/configure.in.in  #1.72:1.73
@@ -12,10 +12,11 @@
 dnl AC_PATH_PROG(ARTSCCONFIG, artsc-config, no)
 
-ARTS_WANT_VERSION=1.1.x
+ARTS_WANT_VERSION_MAJOR=1
+ARTS_WANT_VERSION_MINOR=1
 ARTS_HAVE_VERSION=none
 ARTS_HAVE_PREFIX=none
 
 dnl Check for Glib-2.0
-AC_MSG_CHECKING(for aRts-$ARTS_WANT_VERSION)
+AC_MSG_CHECKING(for aRts-$ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR)
 
 ARTS_OK=no
@@ -34,6 +35,8 @@
   ARTS_HAVE_PREFIX=`echo "$ARTS_HAVE_PREFIX" | sed 's,//*,/,g' | sed -e 's,/$,,'`
 
+  ARTS_MAJOR=`echo $ARTS_HAVE_VERSION | sed 's/\.[[0-9]]*\.[[0-9]]*$//'`
+  ARTS_MINOR=`echo $ARTS_HAVE_VERSION | sed 's/\.[[0-9]]*$//' | sed \
's/^[[0-9]]*\.//'`  dnl don't look at the micro version
-  if test "x`echo $ARTS_HAVE_VERSION | sed 's/\.[[0-9]]*$/.x/'`" = \
"x$ARTS_WANT_VERSION"; then +  if test "x$ARTS_MAJOR" != "x" && test "x$ARTS_MINOR" \
!= "x" && test $ARTS_MAJOR -ge $ARTS_WANT_VERSION_MAJOR && test $ARTS_MINOR -ge \
$ARTS_WANT_VERSION_MINOR; then  realartsprefix=`(cd $ARTS_HAVE_PREFIX; /bin/pwd)`
           realprefix=`(cd $prefix; /bin/pwd)`
@@ -41,5 +44,5 @@
                 ARTS_OK=yes
         else
-  AC_MSG_ERROR([aRts $ARTS_WANT_VERSION not installed in the same prefix as KDE!
+  AC_MSG_ERROR([aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not installed \
in the same prefix as KDE!  Please reinstall aRts in the same prefix as KDE, \
different prefixes are not  supported right now.
@@ -53,5 +56,5 @@
 
   if test "x$ARTS_OK" = "xno"; then
-  AC_MSG_ERROR([aRts $ARTS_WANT_VERSION not found.
+  AC_MSG_ERROR([aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not found.
 
 You'll need to install a suitable version of aRts in the same prefix as KDE
@@ -62,5 +65,5 @@
  * kdelibs prefix: $prefix
  * aRts prefix: $ARTS_HAVE_PREFIX
- * aRts version: $ARTS_HAVE_VERSION (required: $ARTS_WANT_VERSION)
+ * aRts version: $ARTS_HAVE_VERSION (required: \
$ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR)  )
 ])


[prev in list] [next in list] [prev in thread] [next in thread]