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

Do not use pkg-config for codegen directory on mingw

Browse Source
This commit is contained in:
Yevgen Muntyan 2006-04-30 13:43:07 -05:00
parent 1d57079af8
commit 0b1fed998e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
m4/moo-pygtk.m4
View File

@ -20,9 +20,6 @@ AC_DEFUN([_MOO_AC_PYGTK_CODEGEN],[
fi
])
PYGTK_CODEGEN_DIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
AC_SUBST(PYGTK_CODEGEN_DIR)
if test x$MOO_USE_CUSTOM_CODEGEN != xyes; then
AC_MSG_NOTICE([pygtk codegen dir: $PYGTK_CODEGEN_DIR])
fi
@ -66,7 +63,7 @@ AC_DEFUN([_MOO_AC_CHECK_PYGTK_MINGW],[
AC_SUBST(PYGTK_CFLAGS)
PYGTK_DEFS_DIR=$PYTHON_PREFIX/share/pygtk/2.0/defs
AC_SUBST(PYGTK_DEFS_DIR)
PYGTK_CODEGEN_DIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
PYGTK_CODEGEN_DIR=$PYTHON_PREFIX/share/pygtk/2.0/codegen
AC_SUBST(PYGTK_CODEGEN_DIR)
AC_MSG_NOTICE([pygtk defs dir: $PYGTK_DEFS_DIR])
$2
@ -109,6 +106,8 @@ AC_DEFUN([_MOO_AC_CHECK_PYGTK_UNIX],[
$2
PYGTK_DEFS_DIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
AC_SUBST(PYGTK_DEFS_DIR)
PYGTK_CODEGEN_DIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
AC_SUBST(PYGTK_CODEGEN_DIR)
AC_MSG_NOTICE([pygtk defs dir: $PYGTK_DEFS_DIR])
_MOO_AC_PYGTK_CODEGEN
],[

2
mingw-configure
View File

@ -9,7 +9,7 @@ export PKG_CONFIG_LIBDIR=$GTK_PREFIX/lib/pkgconfig
############################################################################
if [ x`basename $0` = xfake-pkg-config ]; then
if [ $1 -a $1 = "--atleast-pkgconfig-version" ]; then
if [ $1 -a "$1" = "--atleast-pkgconfig-version" ]; then
exec /usr/bin/pkg-config --atleast-pkgconfig-version $2
else
exec /usr/bin/pkg-config --define-variable=prefix=$GTK_PREFIX $*