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

List:       kde-commits
Subject:    kdevelop/parts/appwizard/common
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2003-10-31 20:17:49
[Download RAW message or body]

CVS commit by helio: 

- Fixed detection of wxwindows versions >= 2.3.3


  M +9 -15     wx-configure.in   1.2


--- kdevelop/parts/appwizard/common/wx-configure.in  #1.1:1.2
@@ -19,4 +19,5 @@
     fi
 ])
+
 AC_MSG_CHECKING([wxWindows version])
 if wxversion=`$WXCONFIG --version`; then
@@ -26,20 +27,13 @@
     AC_MSG_ERROR([wxWindows is required. Try --with-wx-config.])
 fi
-case $wxversion in
-        [2.3.3])
-                ;;
-        [2.4.0])
-                ;;
-        [2.4.1])
-                ;;
-        *)
-                AC_MSG_ERROR([wxWindows 2.3.3 or 2.4.0 required])
-                AC_MSG_ERROR([Try --with-wx-config.])
-      ;;
-esac
 
-WX_CPPFLAGS="`$WXCONFIG --cppflags`"
-WX_CXXFLAGS="`$WXCONFIG --cxxflags | sed -e 's/-fno-exceptions//'`"
-WX_LIBS="`$WXCONFIG --libs`"
+vers=`echo $wxversion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'`
+if test -n "$vers" && test "$vers" -ge 2003003; then
+        WX_CPPFLAGS="`$WXCONFIG --cppflags`"
+        WX_CXXFLAGS="`$WXCONFIG --cxxflags | sed -e 's/-fno-exceptions//'`"
+        WX_LIBS="`$WXCONFIG --libs`"
+else
+        AC_MSG_ERROR([wxWindows 2.3.3 or newer is required])
+fi
 
 CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"


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