gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 23:42:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Be consistent in prepending flags to existing LDFLAGS and CPPLFLAGS

Browse source
This commit is contained in:
Riccardo Mottola 2018-03-03 19:58:03 +01:00
parent f41d8b26fa
commit 75adf6130a
3 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2018-03-03 Riccardo Mottola <rm@gnu.org>
* configure.ac
* configure
Be consistent in prepending flags to existing LDFLAGS and CPPLFLAGS.
2018-02-25 Yavor Doganov <yavor@gnu.org>
* Tools/font_cacher.1: New file.

20
configure vendored
View file

@ -3427,10 +3427,10 @@ LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
#--------------------------------------------------------------------
case "$target_os" in
freebsd* | openbsd* )
CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
netbsd*) CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
CPPFLAGS="-I/usr/pkg/include $CPPFLAGS"
LDFLAGS="-L/usr/pkg/lib $LDFLAGS";;
netbsd*) CPPFLAGS="-I/usr/pkg/include $CPPFLAGS"
LDFLAGS="-Wl,-R/usr/pkg/lib -L/usr/pkg/lib $LDFLAGS";;
esac
#--------------------------------------------------------------------
@ -4551,13 +4551,13 @@ $as_echo "no" >&6; }
fi
if test $set_x_paths = yes; then
GRAPHIC_CFLAGS="$X_CFLAGS $GRAPHIC_CFLAGS"
CPPFLAGS="$X_CFLAGS $CPPFLAGS"
GRAPHIC_CFLAGS="$GRAPHIC_CFLAGS $X_CFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
# Note: Don't include $X_LIBS in LDFLAGS as it may conflict with
# other libraries installed in /sw, /sw/lib/freetyp2/lib
#GRAPHIC_LFLAGS="$X_LIBS $GRAPHIC_LFLAGS"
# But do include it here just to find the extra x libraries
LDFLAGS="$X_LIBS $LDFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
LIBS="-lX11 $X_EXTRA_LIBS $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXext" >&5
@ -5296,7 +5296,7 @@ fi
if test x"$FREETYPE_LIBS" != x; then
save_CPPFLAGS=${CPPFLAGS}
CPPFLAGS="${CPPFLAGS} ${FREETYPE_CFLAGS}"
CPPFLAGS="${FREETYPE_CFLAGS} ${CPPFLAGS}"
ac_fn_c_check_header_mongrel "$LINENO" "ft2build.h" "ac_cv_header_ft2build_h" "$ac_includes_default"
if test "x$ac_cv_header_ft2build_h" = xyes; then :
have_freetype=yes
@ -7260,8 +7260,8 @@ if test $BUILD_SERVER = x11; then
as_fn_error $? "libXext not found - required for building x11 server" "$LINENO" 5
fi
if test "x$WITH_GLX" = "xyes"; then
LIBS="$LIBS $GLX_LIBS"
CPPFLAGS="$CPPFLAGS $GLX_CFLAGS"
LIBS="$GLX_LIBS $LIBS"
CPPFLAGS="$GLX_CFLAGS $CPPFLAGS"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: Warning : no OpenGL support for X11 backend" >&5
$as_echo "$as_me: Warning : no OpenGL support for X11 backend" >&6;}

20
configure.ac
View file

@ -129,10 +129,10 @@ LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
#--------------------------------------------------------------------
case "$target_os" in
freebsd* | openbsd* )
CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
netbsd*) CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
CPPFLAGS="-I/usr/pkg/include $CPPFLAGS"
LDFLAGS="-L/usr/pkg/lib $LDFLAGS";;
netbsd*) CPPFLAGS="-I/usr/pkg/include $CPPFLAGS"
LDFLAGS="-Wl,-R/usr/pkg/lib -L/usr/pkg/lib $LDFLAGS";;
esac
#--------------------------------------------------------------------
@ -165,13 +165,13 @@ fi
PKG_PROG_PKG_CONFIG
if test $set_x_paths = yes; then
GRAPHIC_CFLAGS="$X_CFLAGS $GRAPHIC_CFLAGS"
CPPFLAGS="$X_CFLAGS $CPPFLAGS"
GRAPHIC_CFLAGS="$GRAPHIC_CFLAGS $X_CFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
# Note: Don't include $X_LIBS in LDFLAGS as it may conflict with
# other libraries installed in /sw, /sw/lib/freetyp2/lib
#GRAPHIC_LFLAGS="$X_LIBS $GRAPHIC_LFLAGS"
# But do include it here just to find the extra x libraries
LDFLAGS="$X_LIBS $LDFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
LIBS="-lX11 $X_EXTRA_LIBS $LIBS"
AC_CHECK_LIB(Xext, main)
@ -264,7 +264,7 @@ if test $with_freetype = yes; then
if test x"$FREETYPE_LIBS" != x; then
save_CPPFLAGS=${CPPFLAGS}
CPPFLAGS="${CPPFLAGS} ${FREETYPE_CFLAGS}"
CPPFLAGS="${FREETYPE_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER(ft2build.h,have_freetype=yes, have_freetype=no)
CPPFLAGS="${save_CPPFLAGS}"
fi
@ -713,8 +713,8 @@ if test $BUILD_SERVER = x11; then
AC_MSG_ERROR([libXext not found - required for building x11 server])
fi
if test "x$WITH_GLX" = "xyes"; then
LIBS="$LIBS $GLX_LIBS"
CPPFLAGS="$CPPFLAGS $GLX_CFLAGS"
LIBS="$GLX_LIBS $LIBS"
CPPFLAGS="$GLX_CFLAGS $CPPFLAGS"
else
AC_MSG_NOTICE([Warning : no OpenGL support for X11 backend])
fi