mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 13:10:59 +00:00
Simplity graphics libs lookup
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17848 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
76a002f6df
commit
df87412ec1
7 changed files with 549 additions and 434 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2003-10-13 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.ac: Simplify graphics libs lookup
|
||||
* config.make.in: Update.
|
||||
|
||||
* Documentation/make_services.1: New file (from Martin Brecher)
|
||||
* Documentation/GNUmakefile: Install it.
|
||||
|
||||
2003-10-09 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Tools/make_services.m: Add quiet option.
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ BUGS_TEXT_MAIN = todo.texi
|
|||
BUGS_DOC_INSTALL_DIR = Developer/Gui/ReleaseNotes/$(VERSION)
|
||||
|
||||
# Manual pages to install
|
||||
MAN1_PAGES = gopen.1
|
||||
MAN1_PAGES = gopen.1 make_services.1
|
||||
|
||||
#
|
||||
# NB. Library reference documentation is generated by rules in the postamble
|
||||
|
|
|
|||
86
Documentation/make_services.1
Normal file
86
Documentation/make_services.1
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
.\"make_services(1) man page
|
||||
.\"put together by Martin Brecher <martin@gnustep.de>
|
||||
.\"
|
||||
.\"Process this file with
|
||||
.\"groff -man -Tascii make_services.1
|
||||
.\"
|
||||
.TH MAKE_SERVICES 1 "October 2003" GNUstep "GNUstep System Manual"
|
||||
.SH NAME
|
||||
make_services \- generate GNUstep services info
|
||||
|
||||
.SH SYNOPSIS
|
||||
.B make_services
|
||||
.RB [ --test
|
||||
.IR filename
|
||||
.RB ]
|
||||
.RB [ "--verbose\fP" | "--quiet\fP" ]
|
||||
.P
|
||||
.SH DESCRIPTION
|
||||
.B make_services
|
||||
builds a validated cache of service information for use by
|
||||
programs that want to access the GNUstep services facility.
|
||||
Additionally, it builds a list of applications and service bundles found
|
||||
in the standard directories. This cache is usually stored in the file named
|
||||
.I .GNUstepServices
|
||||
in the user's GNUstep directory.
|
||||
.P
|
||||
Most commonly,
|
||||
.I make_services
|
||||
is called from within the GNUstep.sh or GNUstep.csh script to update the
|
||||
service information everytime the GNUstep environmet is set up, i.e.
|
||||
in a login script. But of course it is possible to run
|
||||
.I make_services
|
||||
from the command line whenever you wish, for example after having installed
|
||||
a new application or service.
|
||||
.PP
|
||||
The
|
||||
.I Services
|
||||
menu in an application's mainmenu is usually updated automatically. However, it
|
||||
may be neccessary to close an open or torn off menu for the changes to appear.
|
||||
Also, the workspace manager may have to be closed and restarted for file
|
||||
association changes to take effect.
|
||||
.P
|
||||
.SH OPTIONS
|
||||
.IP "\fB--test \fIfilename"
|
||||
check that property list
|
||||
.I filename
|
||||
contains a valid service information.
|
||||
.IP "\fB--quiet"
|
||||
suppress warnings (not recommended but useful in login scripts).
|
||||
.IP "\fB--verbose"
|
||||
give verbose output.
|
||||
.IP "\fB--help"
|
||||
show small help screen.
|
||||
.PP
|
||||
.SH EXAMPLES
|
||||
Simply rebuild the cache of service information:
|
||||
.PP
|
||||
.I make_services
|
||||
.PP
|
||||
Check whether the file ServiceInfo.plist contains a valid service description:
|
||||
.PP
|
||||
.I make_services --test ServiceInfo.plist
|
||||
.P
|
||||
.SH NOTES
|
||||
Giving both
|
||||
.I --quiet
|
||||
and
|
||||
.I --verbose
|
||||
on the command line will result in verbose output, ignoring the
|
||||
.I --quiet
|
||||
argument.
|
||||
.P
|
||||
.SH SEE ALSO
|
||||
GNUstep(7), gopen(1)
|
||||
.P
|
||||
.SH HISTORY
|
||||
Work on
|
||||
.B make_services
|
||||
started November 1998.
|
||||
.P
|
||||
This manual page was first written October 2003.
|
||||
.P
|
||||
.SH AUTHORS
|
||||
make_services was written by Richard Frith-Macdonald <richard@brainstorm.co.uk>.
|
||||
.P
|
||||
This man page was written by Martin Brecher <martin@mb-itconsulting.com>.
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* Source/config.h.in. Generated from configure.ac by autoheader. */
|
||||
/* Headers/Additions/GNUstepGUI/config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Define to 1 if you have the <audiofile.h> header file. */
|
||||
#undef HAVE_AUDIOFILE_H
|
||||
|
|
@ -6,9 +6,27 @@
|
|||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define to 1 if you have the <jpeglib.h> header file. */
|
||||
#undef HAVE_JPEGLIB_H
|
||||
|
||||
/* Define to 1 if you have the `audiofile' library (-laudiofile). */
|
||||
#undef HAVE_LIBAUDIOFILE
|
||||
|
||||
/* Define to 1 if you have the `jpeg' library (-ljpeg). */
|
||||
#undef HAVE_LIBJPEG
|
||||
|
||||
/* Define to 1 if you have the `m' library (-lm). */
|
||||
#undef HAVE_LIBM
|
||||
|
||||
/* Define to 1 if you have the `png' library (-lpng). */
|
||||
#undef HAVE_LIBPNG
|
||||
|
||||
/* Define to 1 if you have the `tiff' library (-ltiff). */
|
||||
#undef HAVE_LIBTIFF
|
||||
|
||||
/* Define to 1 if you have the `z' library (-lz). */
|
||||
#undef HAVE_LIBZ
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
|
||||
ADDITIONAL_INCLUDE_DIRS += @ADDITIONAL_INCLUDE_DIRS@
|
||||
ADDITIONAL_LIB_DIRS += @ADDITIONAL_LIB_DIRS@
|
||||
ADDITIONAL_DEPENDS = @ADDITIONAL_DEPENDS@
|
||||
ADDITIONAL_DEPENDS = @LIBS@
|
||||
|
||||
BUILD_GSND=@BUILD_GSND@
|
||||
|
|
|
|||
746
configure
vendored
746
configure
vendored
|
|
@ -308,7 +308,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP BUILD_GSND GNUSTEP_GUI_VERSION GNUSTEP_GUI_MAJOR_VERSION GNUSTEP_GUI_MINOR_VERSION GNUSTEP_GUI_SUBMINOR_VERSION ADDITIONAL_LIB_DIRS ADDITIONAL_INCLUDE_DIRS ADDITIONAL_DEPENDS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP BUILD_GSND GNUSTEP_GUI_VERSION GNUSTEP_GUI_MAJOR_VERSION GNUSTEP_GUI_MINOR_VERSION GNUSTEP_GUI_SUBMINOR_VERSION ADDITIONAL_LIB_DIRS ADDITIONAL_INCLUDE_DIRS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -2679,9 +2679,8 @@ done
|
|||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for JPEG
|
||||
# Find JPEG
|
||||
#--------------------------------------------------------------------
|
||||
GRAPHIC_LIBS=
|
||||
GRAPHIC_CFLAGS=
|
||||
GRAPHIC_LFLAGS=
|
||||
|
||||
|
|
@ -2709,151 +2708,8 @@ if test -n "$with_jpeg_include"; then
|
|||
with_jpeg_include="-I$with_jpeg_include"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
jpeg_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="${with_jpeg_library} ${with_jpeg_include} ${CPPFLAGS}"
|
||||
|
||||
echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
||||
echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-ljpeg $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char jpeg_destroy_decompress ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
jpeg_destroy_decompress ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_jpeg_jpeg_destroy_decompress=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6
|
||||
if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then
|
||||
jpeg_ok=yes
|
||||
else
|
||||
jpeg_ok=no
|
||||
fi
|
||||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
echo "$as_me:$LINENO: checking for jpeglib.h" >&5
|
||||
echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <stdio.h>
|
||||
#undef PACKAGE
|
||||
#undef VERSION
|
||||
#undef HAVE_STDLIB_H
|
||||
#include <jpeglib.h>
|
||||
_ACEOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null; then
|
||||
if test -s conftest.err; then
|
||||
ac_cpp_err=$ac_c_preproc_warn_flag
|
||||
else
|
||||
ac_cpp_err=
|
||||
fi
|
||||
else
|
||||
ac_cpp_err=yes
|
||||
fi
|
||||
if test -z "$ac_cpp_err"; then
|
||||
jpeg_ok=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
jpeg_ok=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $jpeg_ok" >&5
|
||||
echo "${ECHO_T}$jpeg_ok" >&6
|
||||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
GRAPHIC_LFLAGS="${with_jpeg_library} $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="${with_jpeg_include} $GRAPHIC_CFLAGS"
|
||||
fi
|
||||
fi
|
||||
CPPFLAGS="${jpeg_check_lib_save_header}"
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for TIFF
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# 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;
|
||||
|
||||
# Check whether --with-tiff_include or --without-tiff_include was given.
|
||||
if test "${with_tiff_include+set}" = set; then
|
||||
withval="$with_tiff_include"
|
||||
|
||||
else
|
||||
with_tiff_include=
|
||||
fi;
|
||||
|
||||
if test -n "$with_tiff_library"; then
|
||||
with_tiff_library="-L$with_tiff_library"
|
||||
fi
|
||||
if test -n "$with_tiff_include"; then
|
||||
with_tiff_include="-I$with_tiff_include"
|
||||
fi
|
||||
|
||||
|
||||
CPPFLAGS="$with_jpeg_include ${CPPFLAGS}"
|
||||
LDFLAGS="$with_jpeg_library ${LDFLAGS}"
|
||||
|
||||
echo "$as_me:$LINENO: checking for egrep" >&5
|
||||
echo $ECHO_N "checking for egrep... $ECHO_C" >&6
|
||||
|
|
@ -3093,9 +2949,251 @@ fi
|
|||
done
|
||||
|
||||
|
||||
tiff_check_lib_save_header=${CPPFLAGS}
|
||||
tiff_check_lib_save_libs=${LIBS}
|
||||
CPPFLAGS="${with_tiff_library} ${JPEG_LIB} ${with_tiff_include} ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
|
||||
for ac_header in jpeglib.h
|
||||
do
|
||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||||
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||||
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||||
else
|
||||
# Is the header compilable?
|
||||
echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||||
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#include <$ac_header>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
echo "${ECHO_T}$ac_header_compiler" >&6
|
||||
|
||||
# Is the header present?
|
||||
echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||||
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <$ac_header>
|
||||
_ACEOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null; then
|
||||
if test -s conftest.err; then
|
||||
ac_cpp_err=$ac_c_preproc_warn_flag
|
||||
else
|
||||
ac_cpp_err=
|
||||
fi
|
||||
else
|
||||
ac_cpp_err=yes
|
||||
fi
|
||||
if test -z "$ac_cpp_err"; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
echo "${ECHO_T}$ac_header_preproc" >&6
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc in
|
||||
yes:no )
|
||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||||
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||||
(
|
||||
cat <<\_ASBOX
|
||||
## ------------------------------------ ##
|
||||
## Report this to bug-autoconf@gnu.org. ##
|
||||
## ------------------------------------ ##
|
||||
_ASBOX
|
||||
) |
|
||||
sed "s/^/$as_me: WARNING: /" >&2
|
||||
;;
|
||||
no:yes )
|
||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||||
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||||
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||||
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||||
(
|
||||
cat <<\_ASBOX
|
||||
## ------------------------------------ ##
|
||||
## Report this to bug-autoconf@gnu.org. ##
|
||||
## ------------------------------------ ##
|
||||
_ASBOX
|
||||
) |
|
||||
sed "s/^/$as_me: WARNING: /" >&2
|
||||
;;
|
||||
esac
|
||||
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||||
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
eval "$as_ac_Header=$ac_header_preproc"
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||||
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||||
|
||||
fi
|
||||
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
have_jpeg=yes
|
||||
else
|
||||
have_jpeg=no
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
if test "$have_jpeg" = yes; then
|
||||
|
||||
echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
||||
echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-ljpeg $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char jpeg_destroy_decompress ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
jpeg_destroy_decompress ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_jpeg_jpeg_destroy_decompress=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6
|
||||
if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBJPEG 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-ljpeg $LIBS"
|
||||
|
||||
fi
|
||||
|
||||
if test "$ac_cv_lib_jpeg_jpeg_destroy_decompress" = yes; then
|
||||
GRAPHIC_LFLAGS="$with_jpeg_library $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="$with_jpeg_include $GRAPHIC_CFLAGS"
|
||||
fi
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find TIFF
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# 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;
|
||||
|
||||
# Check whether --with-tiff_include or --without-tiff_include was given.
|
||||
if test "${with_tiff_include+set}" = set; then
|
||||
withval="$with_tiff_include"
|
||||
|
||||
else
|
||||
with_tiff_include=
|
||||
fi;
|
||||
|
||||
if test -n "$with_tiff_library"; then
|
||||
with_tiff_library="-L$with_tiff_library"
|
||||
fi
|
||||
if test -n "$with_tiff_include"; then
|
||||
with_tiff_include="-I$with_tiff_include"
|
||||
fi
|
||||
|
||||
CPPFLAGS="$with_tiff_include ${CPPFLAGS}"
|
||||
LDFLAGS="$with_tiff_library ${LDFLAGS}"
|
||||
|
||||
echo "$as_me:$LINENO: checking for main in -lz" >&5
|
||||
echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_z_main+set}" = set; then
|
||||
|
|
@ -3145,169 +3243,15 @@ fi
|
|||
echo "$as_me:$LINENO: result: $ac_cv_lib_z_main" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_z_main" >&6
|
||||
if test $ac_cv_lib_z_main = yes; then
|
||||
HAVE_LIBZ=1
|
||||
else
|
||||
HAVE_LIBZ=0
|
||||
fi
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for -ltiff without -ljpeg nor -lz" >&5
|
||||
echo $ECHO_N "checking for -ltiff without -ljpeg nor -lz... $ECHO_C" >&6
|
||||
LIBS="-ltiff -lm $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBZ 1
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
char TIFFReadScanline();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
TIFFReadScanline()
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
jpeg_notneeded=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
jpeg_notneeded=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $jpeg_notneeded" >&5
|
||||
echo "${ECHO_T}$jpeg_notneeded" >&6
|
||||
LIBS=${tiff_check_lib_save_libs}
|
||||
JPEG=
|
||||
if test "$jpeg_notneeded" = no; then
|
||||
JPEG=-ljpeg
|
||||
LIBS="-lz $LIBS"
|
||||
|
||||
fi
|
||||
|
||||
if test $HAVE_LIBZ = 1; then
|
||||
echo "$as_me:$LINENO: checking for -ltiff without -lz" >&5
|
||||
echo $ECHO_N "checking for -ltiff without -lz... $ECHO_C" >&6
|
||||
LIBS="-ltiff $JPEG -lm $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
char TIFFReadScanline();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
TIFFReadScanline()
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
libz_notneeded=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
libz_notneeded=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
echo "$as_me:$LINENO: result: $libz_notneeded" >&5
|
||||
echo "${ECHO_T}$libz_notneeded" >&6
|
||||
LIBS=${tiff_check_lib_save_libs}
|
||||
if test "$libz_notneeded" = no; then
|
||||
JPEG="$JPEG -lz"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: checking for TIFFReadScanline in -ltiff" >&5
|
||||
echo $ECHO_N "checking for TIFFReadScanline in -ltiff... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_tiff_TIFFReadScanline+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-ltiff $JPEG -lm $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char TIFFReadScanline ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
TIFFReadScanline ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_tiff_TIFFReadScanline=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_tiff_TIFFReadScanline=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadScanline" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadScanline" >&6
|
||||
if test $ac_cv_lib_tiff_TIFFReadScanline = yes; then
|
||||
tiff_ok=yes
|
||||
else
|
||||
tiff_ok=no
|
||||
fi
|
||||
|
||||
if test "$tiff_ok" = yes; then
|
||||
if test "${ac_cv_header_tiffio_h+set}" = set; then
|
||||
if test "${ac_cv_header_tiffio_h+set}" = set; then
|
||||
echo "$as_me:$LINENO: checking for tiffio.h" >&5
|
||||
echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6
|
||||
if test "${ac_cv_header_tiffio_h+set}" = set; then
|
||||
|
|
@ -3437,30 +3381,88 @@ echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6
|
|||
|
||||
fi
|
||||
if test $ac_cv_header_tiffio_h = yes; then
|
||||
tiff_ok=yes
|
||||
have_tiff=yes
|
||||
else
|
||||
tiff_ok=no
|
||||
have_tiff=no
|
||||
fi
|
||||
|
||||
|
||||
if test "$tiff_ok" = yes; then
|
||||
GRAPHIC_LFLAGS="${with_tiff_library} $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="${with_tiff_include} $GRAPHIC_CFLAGS"
|
||||
GRAPHIC_LIBS="-ltiff $JPEG $GRAPHIC_LIBS"
|
||||
else
|
||||
{ echo "$as_me:$LINENO: WARNING: Cannot find libtiff header tiffio" >&5
|
||||
echo "$as_me: WARNING: Cannot find libtiff header tiffio" >&2;}
|
||||
echo "* The GUI library requres the TIFF library"
|
||||
echo "* Use --with-tiff-include to specify the tiff header directory"
|
||||
echo "* and --with-tiff-library to specify the tiff library directory"
|
||||
echo "* if it is not in the usual place(s)"
|
||||
{ { echo "$as_me:$LINENO: error: gnustep-gui will not compile without tiff includes" >&5
|
||||
echo "$as_me: error: gnustep-gui will not compile without tiff includes" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test "$have_tiff" = yes; then
|
||||
|
||||
echo "$as_me:$LINENO: checking for TIFFReadScanline in -ltiff" >&5
|
||||
echo $ECHO_N "checking for TIFFReadScanline in -ltiff... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_tiff_TIFFReadScanline+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
{ echo "$as_me:$LINENO: WARNING: Cannot find libtiff" >&5
|
||||
echo "$as_me: WARNING: Cannot find libtiff" >&2;}
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-ltiff $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char TIFFReadScanline ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
TIFFReadScanline ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_tiff_TIFFReadScanline=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_tiff_TIFFReadScanline=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadScanline" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadScanline" >&6
|
||||
if test $ac_cv_lib_tiff_TIFFReadScanline = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBTIFF 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-ltiff $LIBS"
|
||||
|
||||
fi
|
||||
|
||||
if test "$ac_cv_lib_tiff_TIFFReadScanline" = yes; then
|
||||
GRAPHIC_LFLAGS="$with_tiff_library $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="$with_tiff_include $GRAPHIC_CFLAGS"
|
||||
else
|
||||
have_tiff=no
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$have_tiff" = no; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Cannot find libtiff header and/or library" >&5
|
||||
echo "$as_me: WARNING: Cannot find libtiff header and/or library" >&2;}
|
||||
echo "* The GUI library reqiures the TIFF library"
|
||||
echo "* Use --with-tiff-library to specify the tiff library"
|
||||
echo "* directory if it is not in the usual place(s)"
|
||||
|
|
@ -3470,11 +3472,71 @@ echo "$as_me: WARNING: Cannot find libtiff" >&2;}
|
|||
echo "$as_me: error: gnustep-gui will not compile without tiff" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
CPPFLAGS="${tiff_check_lib_save_header}"
|
||||
|
||||
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $GRAPHIC_CFLAGS"
|
||||
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $GRAPHIC_LFLAGS"
|
||||
ADDITIONAL_DEPENDS="$GRAPHIC_LIBS"
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find additional image libs
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
echo "$as_me:$LINENO: checking for main in -lpng" >&5
|
||||
echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_png_main+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lpng $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
main ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_png_main=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_png_main=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_png_main" >&6
|
||||
if test $ac_cv_lib_png_main = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBPNG 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-lpng $LIBS"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# NSSound
|
||||
|
|
@ -3513,10 +3575,9 @@ 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"
|
||||
LDFLAGS="${with_audiofile_library} $LDFLAGS"
|
||||
|
||||
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
|
||||
|
|
@ -3572,13 +3633,16 @@ fi
|
|||
echo "$as_me:$LINENO: result: $ac_cv_lib_audiofile_afGetVirtualFrameSize" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_audiofile_afGetVirtualFrameSize" >&6
|
||||
if test $ac_cv_lib_audiofile_afGetVirtualFrameSize = yes; then
|
||||
audio_ok=yes
|
||||
else
|
||||
audio_ok=no
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBAUDIOFILE 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-laudiofile $LIBS"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test $audio_ok = yes -a $enable_gsnd = yes; then
|
||||
if test $ac_cv_lib_audiofile_afGetVirtualFrameSize = yes -a $enable_gsnd = yes; then
|
||||
|
||||
for ac_header in audiofile.h
|
||||
do
|
||||
|
|
@ -3721,16 +3785,12 @@ fi
|
|||
|
||||
done
|
||||
|
||||
ADDITIONAL_DEPENDS="$ADDITIONAL_DEPENDS -laudiofile"
|
||||
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS ${with_audiofile_include}"
|
||||
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS ${with_audiofile_library}"
|
||||
BUILD_GSND=gsnd
|
||||
fi
|
||||
|
||||
|
||||
LIBS=${audiofile_check_lib_save_libs}
|
||||
CPPFLAGS=${audiofile_check_lib_save_headers}
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Record the version
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -3749,7 +3809,6 @@ echo "${ECHO_T}$GNUSTEP_GUI_VERSION" >&6
|
|||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Configure
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -4397,7 +4456,6 @@ s,@GNUSTEP_GUI_MINOR_VERSION@,$GNUSTEP_GUI_MINOR_VERSION,;t t
|
|||
s,@GNUSTEP_GUI_SUBMINOR_VERSION@,$GNUSTEP_GUI_SUBMINOR_VERSION,;t t
|
||||
s,@ADDITIONAL_LIB_DIRS@,$ADDITIONAL_LIB_DIRS,;t t
|
||||
s,@ADDITIONAL_INCLUDE_DIRS@,$ADDITIONAL_INCLUDE_DIRS,;t t
|
||||
s,@ADDITIONAL_DEPENDS@,$ADDITIONAL_DEPENDS,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||
CEOF
|
||||
|
|
|
|||
119
configure.ac
119
configure.ac
|
|
@ -81,9 +81,8 @@ AC_CHECK_LIB(m, main)
|
|||
AC_CHECK_FUNCS(rint rintf)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for JPEG
|
||||
# Find JPEG
|
||||
#--------------------------------------------------------------------
|
||||
GRAPHIC_LIBS=
|
||||
GRAPHIC_CFLAGS=
|
||||
GRAPHIC_LFLAGS=
|
||||
|
||||
|
|
@ -101,35 +100,19 @@ if test -n "$with_jpeg_include"; then
|
|||
with_jpeg_include="-I$with_jpeg_include"
|
||||
fi
|
||||
|
||||
AC_DEFUN(AC_CHECK_JPEGLIB,
|
||||
[jpeg_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="$1 $2 ${CPPFLAGS}"
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
|
||||
jpeg_ok=yes,
|
||||
jpeg_ok=no)
|
||||
if test "$jpeg_ok" = yes; then
|
||||
AC_MSG_CHECKING([for jpeglib.h])
|
||||
AC_TRY_CPP([#include <stdio.h>
|
||||
#undef PACKAGE
|
||||
#undef VERSION
|
||||
#undef HAVE_STDLIB_H
|
||||
#include <jpeglib.h>],
|
||||
jpeg_ok=yes,
|
||||
jpeg_ok=no)
|
||||
AC_MSG_RESULT($jpeg_ok)
|
||||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
GRAPHIC_LFLAGS="$1 $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="$2 $GRAPHIC_CFLAGS"
|
||||
CPPFLAGS="$with_jpeg_include ${CPPFLAGS}"
|
||||
LDFLAGS="$with_jpeg_library ${LDFLAGS}"
|
||||
AC_CHECK_HEADERS(jpeglib.h, have_jpeg=yes, have_jpeg=no)
|
||||
if test "$have_jpeg" = yes; then
|
||||
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress)
|
||||
if test "$ac_cv_lib_jpeg_jpeg_destroy_decompress" = yes; then
|
||||
GRAPHIC_LFLAGS="$with_jpeg_library $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="$with_jpeg_include $GRAPHIC_CFLAGS"
|
||||
fi
|
||||
fi
|
||||
CPPFLAGS="${jpeg_check_lib_save_header}"])
|
||||
|
||||
AC_CHECK_JPEGLIB(${with_jpeg_library}, ${with_jpeg_include})
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for TIFF
|
||||
# Find TIFF
|
||||
#--------------------------------------------------------------------
|
||||
AC_ARG_WITH(tiff_library,
|
||||
[ --with-tiff-library=DIR TIFF library file are in DIR], ,
|
||||
|
|
@ -145,54 +128,22 @@ if test -n "$with_tiff_include"; then
|
|||
with_tiff_include="-I$with_tiff_include"
|
||||
fi
|
||||
|
||||
AC_DEFUN(AC_CHECK_TIFFLIB,
|
||||
[tiff_check_lib_save_header=${CPPFLAGS}
|
||||
tiff_check_lib_save_libs=${LIBS}
|
||||
CPPFLAGS="$1 ${JPEG_LIB} $2 ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
AC_CHECK_LIB(z, main, HAVE_LIBZ=1, HAVE_LIBZ=0)
|
||||
|
||||
AC_MSG_CHECKING(for -ltiff without -ljpeg nor -lz)
|
||||
LIBS="-ltiff -lm $LIBS"
|
||||
AC_TRY_LINK([char TIFFReadScanline();], [TIFFReadScanline()],
|
||||
jpeg_notneeded=yes,
|
||||
jpeg_notneeded=no)
|
||||
AC_MSG_RESULT($jpeg_notneeded)
|
||||
LIBS=${tiff_check_lib_save_libs}
|
||||
JPEG=
|
||||
if test "$jpeg_notneeded" = no; then
|
||||
JPEG=-ljpeg
|
||||
fi
|
||||
|
||||
if test $HAVE_LIBZ = 1; then
|
||||
AC_MSG_CHECKING(for -ltiff without -lz)
|
||||
LIBS="-ltiff $JPEG -lm $LIBS"
|
||||
AC_TRY_LINK([char TIFFReadScanline();], [TIFFReadScanline()],
|
||||
libz_notneeded=yes,
|
||||
libz_notneeded=no)
|
||||
AC_MSG_RESULT($libz_notneeded)
|
||||
LIBS=${tiff_check_lib_save_libs}
|
||||
if test "$libz_notneeded" = no; then
|
||||
JPEG="$JPEG -lz"
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(tiff, TIFFReadScanline, tiff_ok=yes, tiff_ok=no, $JPEG -lm)
|
||||
if test "$tiff_ok" = yes; then
|
||||
AC_CHECK_HEADER(tiffio.h, tiff_ok=yes, tiff_ok=no)
|
||||
if test "$tiff_ok" = yes; then
|
||||
GRAPHIC_LFLAGS="$1 $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="$2 $GRAPHIC_CFLAGS"
|
||||
GRAPHIC_LIBS="-ltiff $JPEG $GRAPHIC_LIBS"
|
||||
CPPFLAGS="$with_tiff_include ${CPPFLAGS}"
|
||||
LDFLAGS="$with_tiff_library ${LDFLAGS}"
|
||||
AC_CHECK_LIB(z, main)
|
||||
AC_CHECK_HEADER(tiffio.h, have_tiff=yes, have_tiff=no)
|
||||
if test "$have_tiff" = yes; then
|
||||
AC_CHECK_LIB(tiff, TIFFReadScanline)
|
||||
if test "$ac_cv_lib_tiff_TIFFReadScanline" = yes; then
|
||||
GRAPHIC_LFLAGS="$with_tiff_library $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="$with_tiff_include $GRAPHIC_CFLAGS"
|
||||
else
|
||||
AC_MSG_WARN(Cannot find libtiff header tiffio)
|
||||
echo "* The GUI library requres the TIFF library"
|
||||
echo "* Use --with-tiff-include to specify the tiff header directory"
|
||||
echo "* and --with-tiff-library to specify the tiff library directory"
|
||||
echo "* if it is not in the usual place(s)"
|
||||
AC_MSG_ERROR(gnustep-gui will not compile without tiff includes)
|
||||
have_tiff=no
|
||||
fi
|
||||
else
|
||||
AC_MSG_WARN(Cannot find libtiff)
|
||||
fi
|
||||
|
||||
if test "$have_tiff" = no; then
|
||||
AC_MSG_WARN(Cannot find libtiff header and/or library)
|
||||
echo "* The GUI library reqiures the TIFF library"
|
||||
echo "* Use --with-tiff-library to specify the tiff library"
|
||||
echo "* directory if it is not in the usual place(s)"
|
||||
|
|
@ -200,13 +151,14 @@ else
|
|||
echo "* library is needed by tiff",
|
||||
AC_MSG_ERROR(gnustep-gui will not compile without tiff)
|
||||
fi
|
||||
CPPFLAGS="${tiff_check_lib_save_header}"])
|
||||
|
||||
AC_CHECK_TIFFLIB(${with_tiff_library}, ${with_tiff_include})
|
||||
|
||||
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $GRAPHIC_CFLAGS"
|
||||
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $GRAPHIC_LFLAGS"
|
||||
ADDITIONAL_DEPENDS="$GRAPHIC_LIBS"
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find additional image libs
|
||||
#--------------------------------------------------------------------
|
||||
AC_CHECK_LIB(png, main)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# NSSound
|
||||
|
|
@ -231,24 +183,18 @@ 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)
|
||||
LDFLAGS="${with_audiofile_library} $LDFLAGS"
|
||||
AC_CHECK_LIB(audiofile, afGetVirtualFrameSize)
|
||||
|
||||
if test $audio_ok = yes -a $enable_gsnd = yes; then
|
||||
if test $ac_cv_lib_audiofile_afGetVirtualFrameSize = yes -a $enable_gsnd = yes; then
|
||||
AC_CHECK_HEADERS(audiofile.h)
|
||||
ADDITIONAL_DEPENDS="$ADDITIONAL_DEPENDS -laudiofile"
|
||||
ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS ${with_audiofile_include}"
|
||||
ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS ${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
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -264,7 +210,6 @@ AC_SUBST(GNUSTEP_GUI_SUBMINOR_VERSION)
|
|||
|
||||
AC_SUBST(ADDITIONAL_LIB_DIRS)
|
||||
AC_SUBST(ADDITIONAL_INCLUDE_DIRS)
|
||||
AC_SUBST(ADDITIONAL_DEPENDS)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Configure
|
||||
|
|
|
|||
Loading…
Reference in a new issue