Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed libgnomeprint check to fail if libgnomeprint is too old

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-11-18 21:09:54 +00:00
parent e06cac589d
commit ffa762ff49
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@@ -34896,23 +34896,23 @@ fi
else else
PKG_CONFIG_MIN_VERSION=0.9.0 PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo "$as_me:$LINENO: checking for libgnomeprintui-2.2" >&5 echo "$as_me:$LINENO: checking for libgnomeprintui-2.2 >= 2.8" >&5
echo $ECHO_N "checking for libgnomeprintui-2.2... $ECHO_C" >&6 echo $ECHO_N "checking for libgnomeprintui-2.2 >= 2.8... $ECHO_C" >&6
if $PKG_CONFIG --exists "libgnomeprintui-2.2" ; then if $PKG_CONFIG --exists "libgnomeprintui-2.2 >= 2.8" ; then
echo "$as_me:$LINENO: result: yes" >&5 echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6 echo "${ECHO_T}yes" >&6
succeeded=yes succeeded=yes
echo "$as_me:$LINENO: checking LIBGNOMEPRINTUI_CFLAGS" >&5 echo "$as_me:$LINENO: checking LIBGNOMEPRINTUI_CFLAGS" >&5
echo $ECHO_N "checking LIBGNOMEPRINTUI_CFLAGS... $ECHO_C" >&6 echo $ECHO_N "checking LIBGNOMEPRINTUI_CFLAGS... $ECHO_C" >&6
LIBGNOMEPRINTUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2"` LIBGNOMEPRINTUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8"`
echo "$as_me:$LINENO: result: $LIBGNOMEPRINTUI_CFLAGS" >&5 echo "$as_me:$LINENO: result: $LIBGNOMEPRINTUI_CFLAGS" >&5
echo "${ECHO_T}$LIBGNOMEPRINTUI_CFLAGS" >&6 echo "${ECHO_T}$LIBGNOMEPRINTUI_CFLAGS" >&6
echo "$as_me:$LINENO: checking LIBGNOMEPRINTUI_LIBS" >&5 echo "$as_me:$LINENO: checking LIBGNOMEPRINTUI_LIBS" >&5
echo $ECHO_N "checking LIBGNOMEPRINTUI_LIBS... $ECHO_C" >&6 echo $ECHO_N "checking LIBGNOMEPRINTUI_LIBS... $ECHO_C" >&6
LIBGNOMEPRINTUI_LIBS=`$PKG_CONFIG --libs "libgnomeprintui-2.2"` LIBGNOMEPRINTUI_LIBS=`$PKG_CONFIG --libs "libgnomeprintui-2.2 >= 2.8"`
echo "$as_me:$LINENO: result: $LIBGNOMEPRINTUI_LIBS" >&5 echo "$as_me:$LINENO: result: $LIBGNOMEPRINTUI_LIBS" >&5
echo "${ECHO_T}$LIBGNOMEPRINTUI_LIBS" >&6 echo "${ECHO_T}$LIBGNOMEPRINTUI_LIBS" >&6
else else
@@ -34920,7 +34920,7 @@ echo "${ECHO_T}$LIBGNOMEPRINTUI_LIBS" >&6
LIBGNOMEPRINTUI_LIBS="" LIBGNOMEPRINTUI_LIBS=""
## If we have a custom action on failure, don't print errors, but ## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so. ## do set a variable so people can do so.
LIBGNOMEPRINTUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprintui-2.2"` LIBGNOMEPRINTUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= 2.8"`
fi fi
@@ -38939,7 +38939,11 @@ fi
case ${BAKEFILE_HOST} in case ${BAKEFILE_HOST} in
*-hp-hpux* ) *-hp-hpux* )
<<<<<<< aclocal.m4
INSTALL_DIR="mkdir"
=======
INSTALL_DIR="mkdir -p" INSTALL_DIR="mkdir -p"
>>>>>>> 1.69
;; ;;
*) INSTALL_DIR="$INSTALL -d" *) INSTALL_DIR="$INSTALL -d"
;; ;;

3
configure.in
View File

@@ -4639,7 +4639,8 @@ if test "$WXGTK20" = 1; then
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
PKG_CHECK_MODULES(LIBGNOMEPRINTUI, libgnomeprintui-2.2, PKG_CHECK_MODULES(LIBGNOMEPRINTUI,
[libgnomeprintui-2.2 >= 2.8],
[ [
EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS" EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS" CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS"