gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 13:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't add CPPFLAGS to ADDITIONAL_INCLUDES

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@18706 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2004-02-28 15:38:21 +00:00
parent 0df92e1637
commit 7362c7c275
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-02-28 Adam Fedor <fedor@gnu.org>
* configure.ac: Don't add CPPFLAGS to ADDITIONAL_INCLUDES, add
ungif and X11 flags to GRAPHIC_... flags.
2004-02-26 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSApplication.m: (-beginSheet:...contextInfo:)

13
configure vendored
View file

@ -4631,9 +4631,6 @@ echo "$as_me: error: gnustep-gui will not compile without tiff" >&2;}
{ (exit 1); exit 1; }; }
fi
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $GRAPHIC_CFLAGS"
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $GRAPHIC_LFLAGS"
#--------------------------------------------------------------------
# Find additional image libs
#--------------------------------------------------------------------
@ -4914,9 +4911,12 @@ fi
# ungif.
{ echo "$as_me:$LINENO: -gui will be linked against -lX11 to support ungif images" >&5
echo "$as_me: -gui will be linked against -lX11 to support ungif images" >&6;}
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $CPPFLAGS"
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $LDFLAGS -lX11"
GRAPHIC_CFLAGS="-I${ac_x_includes} ${with_ungif_include} $GRAPHIC_CFLAGS"
GRAPHIC_LFLAGS="-L${ac_x_libraries} ${with_ungif_library} $GRAPHIC_LFLAGS"
fi
else
GRAPHIC_CFLAGS="${with_ungif_include} $GRAPHIC_CFLAGS"
GRAPHIC_LFLAGS="${with_ungif_library} $GRAPHIC_LFLAGS"
fi
fi
@ -5189,6 +5189,9 @@ echo "${ECHO_T}$GNUSTEP_GUI_VERSION" >&6
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $GRAPHIC_CFLAGS"
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $GRAPHIC_LFLAGS"

13
configure.ac
View file

@ -172,9 +172,6 @@ if test "$have_tiff" = no; then
AC_MSG_ERROR(gnustep-gui will not compile without tiff)
fi
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $GRAPHIC_CFLAGS"
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $GRAPHIC_LFLAGS"
#--------------------------------------------------------------------
# Find additional image libs
#--------------------------------------------------------------------
@ -244,9 +241,12 @@ if test "${enable_ungif}" = yes; then
# the flags so that -gui gets linked against the X11 library to support
# ungif.
AC_MSG_NOTICE([-gui will be linked against -lX11 to support ungif images])
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $CPPFLAGS"
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $LDFLAGS -lX11"
GRAPHIC_CFLAGS="-I${ac_x_includes} ${with_ungif_include} $GRAPHIC_CFLAGS"
GRAPHIC_LFLAGS="-L${ac_x_libraries} ${with_ungif_library} $GRAPHIC_LFLAGS"
fi
else
GRAPHIC_CFLAGS="${with_ungif_include} $GRAPHIC_CFLAGS"
GRAPHIC_LFLAGS="${with_ungif_library} $GRAPHIC_LFLAGS"
fi
fi
@ -299,6 +299,9 @@ AC_SUBST(GNUSTEP_GUI_MAJOR_VERSION)
AC_SUBST(GNUSTEP_GUI_MINOR_VERSION)
AC_SUBST(GNUSTEP_GUI_SUBMINOR_VERSION)
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $GRAPHIC_CFLAGS"
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $GRAPHIC_LFLAGS"
AC_SUBST(ADDITIONAL_LIB_DIRS)
AC_SUBST(ADDITIONAL_INCLUDE_DIRS)