nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build without python

Browse Source
This commit is contained in:
Yevgen Muntyan 2007-01-18 05:35:10 -06:00
parent b3657000f8
commit cd1f729711
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
m4/moo-gtk.m4
View File

@ -1,3 +1,17 @@
##############################################################################
# _MOO_SPLIT_VERSION(PKG_NAME,pkg-name)
#
AC_DEFUN([_MOO_SPLIT_VERSION],[
AC_MSG_CHECKING($1 version)
_moo_ac_version=`$PKG_CONFIG --modversion $2`
$1[]_VERSION=$_moo_ac_version
$1[]_MAJOR_VERSION=`echo "$_moo_ac_version" | $SED 's/\([[^.]][[^.]]*\).*/\1/'`
$1[]_MINOR_VERSION=`echo "$_moo_ac_version" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
$1[]_MICRO_VERSION=`echo "$_moo_ac_version" | $SED 's/[[^.]][[^.]]*.[[^.]][[^.]]*.\(.*\)/\1/'`
AC_MSG_RESULT($[]$1[]_MAJOR_VERSION.$[]$1[]_MINOR_VERSION.$[]$1[]_MICRO_VERSION)
])
##############################################################################
# MOO_CHECK_VERSION(PKG_NAME,pkg-name)
#
@ -5,19 +19,12 @@ dnl used also in moo-pygtk.m4
AC_DEFUN([MOO_CHECK_VERSION],[
if test x$MOO_OS_CYGWIN != xyes; then
PKG_CHECK_MODULES($1,$2)
AC_MSG_CHECKING($1 version)
_moo_ac_version=`$PKG_CONFIG --modversion $2`
$1[]_VERSION=$_moo_ac_version
$1[]_MAJOR_VERSION=`echo "$_moo_ac_version" | $SED 's/\([[^.]][[^.]]*\).*/\1/'`
$1[]_MINOR_VERSION=`echo "$_moo_ac_version" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
$1[]_MICRO_VERSION=`echo "$_moo_ac_version" | $SED 's/[[^.]][[^.]]*.[[^.]][[^.]]*.\(.*\)/\1/'`
_MOO_SPLIT_VERSION($1,$2)
m4_foreach([num],[2,4,6,8,10,12,14],
[AM_CONDITIONAL($1[]_2_[]num, test $[]$1[]_MINOR_VERSION -ge num)])
AC_MSG_RESULT($[]$1[]_MAJOR_VERSION.$[]$1[]_MINOR_VERSION.$[]$1[]_MICRO_VERSION)
else
m4_foreach([num],[2,4,6,8,10,12,14],
[AM_CONDITIONAL($1[]_2_[]num, false)])
fi
])

10
m4/moo-pygtk.m4
View File

@ -16,8 +16,6 @@ AC_DEFUN([_MOO_AC_PYGTK_CODEGEN],[
AC_MSG_NOTICE([using installed codegen])
AC_MSG_NOTICE([pygtk codegen dir: $PYGTK_CODEGEN_DIR])
fi
AM_CONDITIONAL(MOO_USE_CUSTOM_CODEGEN, $MOO_USE_CUSTOM_CODEGEN)
])
@ -50,7 +48,6 @@ AC_DEFUN([_MOO_AC_CHECK_PYGTK_REAL],[
AC_SUBST(PYGTK[]$1[]_CODEGEN_DIR,[$PYGTK_CODEGEN_DIR])
])
AC_MSG_NOTICE([pygtk defs dir: $PYGTK_DEFS_DIR])
_MOO_AC_PYGTK_CODEGEN
m4_if([$2],[],[:],[$2])
],[
AC_MSG_RESULT([no])
@ -113,7 +110,7 @@ AC_DEFUN_ONCE([MOO_AC_PYTHON],[
MOO_AC_CHECK_PYTHON($_moo_python_version,[
_MOO_AC_CHECK_PYGTK([
MOO_USE_PYTHON=true
MOO_CHECK_VERSION(PYGTK, pygtk-2.0)
_MOO_SPLIT_VERSION(PYGTK, pygtk-2.0)
AC_SUBST(PYGTK_VERSION)
AC_SUBST(PYGTK_MAJOR_VERSION)
AC_SUBST(PYGTK_MINOR_VERSION)
@ -135,5 +132,10 @@ AC_DEFUN_ONCE([MOO_AC_PYTHON],[
AM_CONDITIONAL(MOO_USE_PYTHON, $MOO_USE_PYTHON)
if $MOO_USE_PYTHON; then
AC_DEFINE(MOO_USE_PYTHON, 1, [build python bindings and plugin])
_MOO_AC_PYGTK_CODEGEN
else
MOO_USE_CUSTOM_CODEGEN=false
fi
AM_CONDITIONAL(MOO_USE_CUSTOM_CODEGEN, $MOO_USE_CUSTOM_CODEGEN)
])