mirror of
https://github.com/gnustep/libs-back.git
synced 2025-04-22 15:31:14 +00:00
Fix a few bugs. Supress pkg-config error message
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@20784 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor
parent
777e7190ba
commit
54f65890e3
4 changed files with 56 additions and 29 deletions
|
|
@ -74,9 +74,6 @@
|
|||
/* Define if you have XftDrawStringUtf8 */
|
||||
#undef HAVE_UTF8
|
||||
|
||||
/* Define to 0 as we don't use wraster anymore */
|
||||
#undef HAVE_WRASTER_H
|
||||
|
||||
/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
|
||||
#undef HAVE_X11_EXTENSIONS_XSHM_H
|
||||
|
||||
|
|
|
|||
56
configure
vendored
56
configure
vendored
|
|
@ -858,6 +858,7 @@ Optional Features:
|
|||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-tiff-library=DIR TIFF library file are in DIR
|
||||
--with-x use the X Window System
|
||||
--with-name=PREFIX Set the name of the backend (def=back)
|
||||
|
||||
|
|
@ -2395,6 +2396,23 @@ case "$target_os" in
|
|||
LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
|
||||
esac
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find TIFF (Solaris requires this to find the correct library, even though
|
||||
# it does not link directly to it)
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# Check whether --with-tiff_library or --without-tiff_library was given.
|
||||
if test "${with_tiff_library+set}" = set; then
|
||||
withval="$with_tiff_library"
|
||||
|
||||
else
|
||||
with_tiff_library=
|
||||
fi;
|
||||
|
||||
if test -n "$with_tiff_library"; then
|
||||
GRAPHIC_LFLAGS="$GRAPHIC_LFLAGS -L$with_tiff_library"
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for X windows
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -4225,7 +4243,6 @@ _ACEOF
|
|||
|
||||
fi
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for DPS
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -4835,10 +4852,12 @@ fi
|
|||
fi
|
||||
|
||||
if test "$PKG_CONFIG" = "no" ; then
|
||||
echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
echo "*** to the full path to pkg-config."
|
||||
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
echo "pkg-config script not be found"
|
||||
## We don't want the user to see this warning
|
||||
## echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
## echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
## echo "*** to the full path to pkg-config."
|
||||
## echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
else
|
||||
PKG_CONFIG_MIN_VERSION=0.9.0
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
||||
|
|
@ -4885,7 +4904,7 @@ echo "${ECHO_T}$XFT_LIBS" >&6
|
|||
fi
|
||||
|
||||
|
||||
if test WITH_XFT = no; then
|
||||
if test $WITH_XFT = no; then
|
||||
# pkg-config failed for some reason, Check the old way?
|
||||
save_CPPFLAGS=${CPPFLAGS}
|
||||
save_LIBS=${LIBS}
|
||||
|
|
@ -6477,10 +6496,12 @@ fi
|
|||
fi
|
||||
|
||||
if test "$PKG_CONFIG" = "no" ; then
|
||||
echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
echo "*** to the full path to pkg-config."
|
||||
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
echo "pkg-config script not be found"
|
||||
## We don't want the user to see this warning
|
||||
## echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
## echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
## echo "*** to the full path to pkg-config."
|
||||
## echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
else
|
||||
PKG_CONFIG_MIN_VERSION=0.9.0
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
||||
|
|
@ -6588,10 +6609,12 @@ fi
|
|||
fi
|
||||
|
||||
if test "$PKG_CONFIG" = "no" ; then
|
||||
echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
echo "*** to the full path to pkg-config."
|
||||
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
echo "pkg-config script not be found"
|
||||
## We don't want the user to see this warning
|
||||
## echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
## echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
## echo "*** to the full path to pkg-config."
|
||||
## echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
else
|
||||
PKG_CONFIG_MIN_VERSION=0.9.0
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
||||
|
|
@ -6804,11 +6827,6 @@ fi
|
|||
WITH_WRASTER=no
|
||||
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_WRASTER_H 0
|
||||
_ACEOF
|
||||
|
||||
|
||||
# Revert to previous flags (removing added GNUstep flags)
|
||||
CPPFLAGS=${GRAPHIC_CFLAGS}
|
||||
LDFLAGS=${GRAPHIC_LFLAGS}
|
||||
|
|
|
|||
16
configure.ac
16
configure.ac
|
|
@ -76,6 +76,18 @@ case "$target_os" in
|
|||
LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
|
||||
esac
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find TIFF (Solaris requires this to find the correct library, even though
|
||||
# it does not link directly to it)
|
||||
#--------------------------------------------------------------------
|
||||
AC_ARG_WITH(tiff_library,
|
||||
[ --with-tiff-library=DIR TIFF library file are in DIR], ,
|
||||
with_tiff_library=)
|
||||
|
||||
if test -n "$with_tiff_library"; then
|
||||
GRAPHIC_LFLAGS="$GRAPHIC_LFLAGS -L$with_tiff_library"
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for X windows
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -114,7 +126,6 @@ if test "$have_funcproto" = no; then
|
|||
AC_DEFINE(FUNCPROTO,1,[Define if X11 doesn't automatically use prototypes])
|
||||
fi
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for DPS
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -148,7 +159,7 @@ fi
|
|||
PKG_XFT=no
|
||||
PKG_CHECK_MODULES(XFT, xft, WITH_XFT=yes, WITH_XFT=no)
|
||||
|
||||
if test WITH_XFT = no; then
|
||||
if test $WITH_XFT = no; then
|
||||
# pkg-config failed for some reason, Check the old way?
|
||||
save_CPPFLAGS=${CPPFLAGS}
|
||||
save_LIBS=${LIBS}
|
||||
|
|
@ -316,7 +327,6 @@ fi
|
|||
#--------------------------------------------------------------------
|
||||
WITH_WRASTER=no
|
||||
AC_SUBST(WITH_WRASTER)
|
||||
AC_DEFINE(HAVE_WRASTER_H,0,[Define to 0 as we don't use wraster anymore])
|
||||
|
||||
# Revert to previous flags (removing added GNUstep flags)
|
||||
CPPFLAGS=${GRAPHIC_CFLAGS}
|
||||
|
|
|
|||
10
pkg.m4
10
pkg.m4
|
|
@ -10,10 +10,12 @@ AC_DEFUN(PKG_CHECK_MODULES, [
|
|||
fi
|
||||
|
||||
if test "$PKG_CONFIG" = "no" ; then
|
||||
echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
echo "*** to the full path to pkg-config."
|
||||
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
echo "pkg-config script not be found"
|
||||
## We don't want the user to see this warning
|
||||
## echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
## echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
## echo "*** to the full path to pkg-config."
|
||||
## echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
else
|
||||
PKG_CONFIG_MIN_VERSION=0.9.0
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue