From: Francesco M. <fr...@us...> - 2006-01-27 21:58:07
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/build/autoconf Modified Files: wxpresets.m4 Log Message: fixed top_builddir problems Index: wxpresets.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxpresets.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxpresets.m4 23 Jan 2006 19:38:29 -0000 1.3 --- wxpresets.m4 27 Jan 2006 21:57:06 -0000 1.4 *************** *** 177,186 **** dnl be sure that the WX_VERSION macro has the same format of the WX_VERSION option dnl which is used by wx_win32.bkl (i.e. 25, 26, 27... instead of 2.5.x, 2.6.x, 2.7.x...) ! wx_config_major_version=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ! wx_config_minor_version=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version dnl FOR DEBUG ONLY --- 177,190 ---- dnl be sure that the WX_VERSION macro has the same format of the WX_VERSION option dnl which is used by wx_win32.bkl (i.e. 25, 26, 27... instead of 2.5.x, 2.6.x, 2.7.x...) ! WX_VERSION_MAJOR=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ! WX_VERSION_MINOR=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version + dnl these are required ! + AC_SUBST(WX_VERSION_MAJOR) + AC_SUBST(WX_VERSION_MINOR) + dnl FOR DEBUG ONLY *************** *** 307,310 **** --- 311,316 ---- ]) fi + AC_SUBST(WX_PORT) + AC_SUBST(WX_GTKPORT_VERSION) ]) *************** *** 339,343 **** echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi ! echo " - VERSION: $WX_VERSION" if test "$WX_PORT" = "gtk"; then --- 345,349 ---- echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi ! echo " - VERSION: $WX_VERSION_MAJOR.$WX_VERSION_MINOR" if test "$WX_PORT" = "gtk"; then |