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

Fix up INCLUDE flags

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16915 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2003-06-13 03:46:21 +00:00
parent f99a743b43
commit 0c5ea479e7
3 changed files with 75 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-06-08 Kazunobu Kuriyama <kazunobu.kuriyama@nifty.com>
* configure.ac: Add --with-audiofile-include and --with-audiofile
-library options
2003-06-11 Dirk Latterman <dlatt@alqualonde.de>
* Source/NSActionCell.m (-setObjectValue:): Implemented.

43
configure vendored
View file

@ -836,6 +836,8 @@ Optional Packages:
--with-jpeg-include=DIR JPEG include files are in DIR
--with-tiff-library=DIR TIFF library file are in DIR
--with-tiff-include=DIR TIFF include files are in DIR
--with-audiofile-library=DIR AUDIOFILE library file are in DIR
--with-audiofile-include=DIR AUDIOFILE include files are in DIR
Some influential environment variables:
CC C compiler command
@ -1340,6 +1342,8 @@ LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
#--------------------------------------------------------------------
# Add target OS directories as necessary
#--------------------------------------------------------------------
ADDITIONAL_INCLUDE_DIRS="$CPPFLAGS"
ADDITIONAL_LIB_DIRS="$LDFLAGS"
case "$target_os" in
freebsd*) CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib";;
@ -3172,8 +3176,8 @@ echo "$as_me: error: gnustep-gui will not compile without tiff" >&2;}
fi
CPPFLAGS="${tiff_check_lib_save_header}"
ADDITIONAL_INCLUDE_DIRS="$GRAPHIC_CFLAGS"
ADDITIONAL_LIB_DIRS="$GRAPHIC_LFLAGS"
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $GRAPHIC_CFLAGS"
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $GRAPHIC_LFLAGS"
ADDITIONAL_DEPENDS="$GRAPHIC_LIBS"
#--------------------------------------------------------------------
@ -3188,6 +3192,35 @@ else
fi;
audio_ok=no
BUILD_GSND=
# Check whether --with-audiofile_library or --without-audiofile_library was given.
if test "${with_audiofile_library+set}" = set; then
withval="$with_audiofile_library"
else
with_audiofile_library=
fi;
# Check whether --with-audiofile_include or --without-audiofile_include was given.
if test "${with_audiofile_include+set}" = set; then
withval="$with_audiofile_include"
else
with_audiofile_include=
fi;
if test -n "$with_audiofile_library"; then
with_audiofile_library="-L$with_audiofile_library"
fi
if test -n "$with_audiofile_include"; then
with_audiofile_include="-I$with_audiofile_include"
fi
audiofile_check_lib_save_headers=$CPPFLAGS
audiofile_check_lib_save_libs=$LIBS
CPPFLAGS="${with_audiofile_include} $CPPFLAGS"
LIBS="${with_audiofile_library} $LIBS"
echo "$as_me:$LINENO: checking for afGetVirtualFrameSize in -laudiofile" >&5
echo $ECHO_N "checking for afGetVirtualFrameSize in -laudiofile... $ECHO_C" >&6
if test "${ac_cv_lib_audiofile_afGetVirtualFrameSize+set}" = set; then
@ -3249,6 +3282,7 @@ else
audio_ok=no
fi
if test $audio_ok = yes -a $enable_gsnd = yes; then
for ac_header in audiofile.h
@ -3365,10 +3399,15 @@ fi
done
ADDITIONAL_DEPENDS="$ADDITIONAL_DEPENDS -laudiofile"
ADDITIONAL_INCLUDE_DIRS="$GRAPHIC_CFLAGS ${with_audiofile_include}"
ADDITIONAL_LIB_DIRS="$GRAPHIC_LFLAGS ${with_audiofile_library}"
BUILD_GSND=gsnd
fi
LIBS=${audiofile_check_lib_save_libs}
CPPFLAGS=${audiofile_check_lib_save_headers}
#--------------------------------------------------------------------
# Record the version
#--------------------------------------------------------------------

31
configure.ac
View file

@ -61,6 +61,8 @@ LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
#--------------------------------------------------------------------
# Add target OS directories as necessary
#--------------------------------------------------------------------
ADDITIONAL_INCLUDE_DIRS="$CPPFLAGS"
ADDITIONAL_LIB_DIRS="$LDFLAGS"
case "$target_os" in
freebsd*) CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib";;
@ -201,8 +203,8 @@ CPPFLAGS="${tiff_check_lib_save_header}"])
AC_CHECK_TIFFLIB(${with_tiff_library}, ${with_tiff_include})
ADDITIONAL_INCLUDE_DIRS="$GRAPHIC_CFLAGS"
ADDITIONAL_LIB_DIRS="$GRAPHIC_LFLAGS"
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $GRAPHIC_CFLAGS"
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $GRAPHIC_LFLAGS"
ADDITIONAL_DEPENDS="$GRAPHIC_LIBS"
#--------------------------------------------------------------------
@ -213,14 +215,39 @@ AC_ARG_ENABLE(gsnd,
enable_gsnd=yes)
audio_ok=no
BUILD_GSND=
AC_ARG_WITH(audiofile_library,
[ --with-audiofile-library=DIR AUDIOFILE library file are in DIR], ,
with_audiofile_library=)
AC_ARG_WITH(audiofile_include,
[ --with-audiofile-include=DIR AUDIOFILE include files are in DIR], ,
with_audiofile_include=)
if test -n "$with_audiofile_library"; then
with_audiofile_library="-L$with_audiofile_library"
fi
if test -n "$with_audiofile_include"; then
with_audiofile_include="-I$with_audiofile_include"
fi
audiofile_check_lib_save_headers=$CPPFLAGS
audiofile_check_lib_save_libs=$LIBS
CPPFLAGS="${with_audiofile_include} $CPPFLAGS"
LIBS="${with_audiofile_library} $LIBS"
AC_CHECK_LIB(audiofile, afGetVirtualFrameSize, audio_ok=yes, audio_ok=no)
if test $audio_ok = yes -a $enable_gsnd = yes; then
AC_CHECK_HEADERS(audiofile.h)
ADDITIONAL_DEPENDS="$ADDITIONAL_DEPENDS -laudiofile"
ADDITIONAL_INCLUDE_DIRS="$GRAPHIC_CFLAGS ${with_audiofile_include}"
ADDITIONAL_LIB_DIRS="$GRAPHIC_LFLAGS ${with_audiofile_library}"
BUILD_GSND=gsnd
fi
AC_SUBST(BUILD_GSND)
LIBS=${audiofile_check_lib_save_libs}
CPPFLAGS=${audiofile_check_lib_save_headers}
#--------------------------------------------------------------------
# Record the version
#--------------------------------------------------------------------