mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Merge from dawn branch
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@3875 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
a956b6100b
commit
3c75a762e6
5 changed files with 160 additions and 85 deletions
50
ChangeLog
50
ChangeLog
|
|
@ -1,3 +1,7 @@
|
|||
1999-03-08 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Merge dawn branch into main.
|
||||
|
||||
Tue Mar 2 08:57:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
|
||||
* make/target.make: Include GNUSTEP_SYSTEM_LIBRARIES in link list to
|
||||
|
|
@ -7,6 +11,41 @@ Tue Mar 2 08:04:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
|||
|
||||
* Merge in 'dawn' CVS branch.
|
||||
|
||||
1999-02-22 Scott Christley <scottc@golden.net-community.com>
|
||||
|
||||
* opentool: New file.
|
||||
|
||||
1999-02-19 Scott Christley <scottc@golden.net-community.com>
|
||||
|
||||
* MediaBook.sh (MB_GNUSTEP_SOURCE, MB_FINANCE_SOURCE): New variables.
|
||||
(MB.init): Renamed to MBinit.sh and put under GNUSTEP_USER_ROOT.
|
||||
* setlocaltz.sh: New file.
|
||||
* MediaBook.func: Add help for new commands.
|
||||
|
||||
1999-03-08 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Version 0.5.5 Released.
|
||||
|
||||
1999-03-05 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* brain.make: Switch order of TIFF_INCLUDE and X_INCLUDE.
|
||||
|
||||
1999-03-04 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Check if tiff libary nees jpeg. Rearrange tiff and
|
||||
jpeg checks so they exit if not found and compiling core libraries.
|
||||
* config.make.in (JPEG): New variable to hold "-ljpeg" if needed.
|
||||
* brain.make: Use it. Switch order of TIFF_LIB and X_LIBS (For solaris).
|
||||
|
||||
Wed Mar 3 06:56:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
|
||||
* configure.in: Fix to detect jpeglib.h on redhat
|
||||
|
||||
Tue Mar 2 17:05:57 1999 Adam Fedor <fedor@ultra.doc.com>
|
||||
|
||||
* configure.in: Make AC_ERROR into AC_WARN (since make could be
|
||||
used with non-gui libs).
|
||||
|
||||
1999-03-01 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: New search for DPS libraries.
|
||||
|
|
@ -64,10 +103,6 @@ Thu Feb 25 03:01:48 1999 Masatake Yamato <masata-y@is.aist-nara.ac.jp>
|
|||
* brain.make: Define GNUSTEP if using GNUstep libraries.
|
||||
* common.make (AUXILARY_CPPFLAGS): Include GNUSTEP and Version defines.
|
||||
|
||||
1999-02-22 Scott Christley <scottc@golden.net-community.com>
|
||||
|
||||
* opentool: New file.
|
||||
|
||||
Sun Feb 21 15:01:48 1999 Masatake Yamato <masata-y@is.aist-nara.ac.jp>
|
||||
|
||||
* target.make (Solaris::AFTER_INSTALL_SHARED_LIB_COMMAND):
|
||||
|
|
@ -77,13 +112,6 @@ Sun Feb 21 13:49:55 1999 Masatake Yamato <masata-y@is.aist-nara.ac.jp>
|
|||
|
||||
* rules.make (%.build): Check the length of string, $($*_SUBPROJECTS).
|
||||
|
||||
1999-02-19 Scott Christley <scottc@golden.net-community.com>
|
||||
|
||||
* MediaBook.sh (MB_GNUSTEP_SOURCE, MB_FINANCE_SOURCE): New variables.
|
||||
(MB.init): Renamed to MBinit.sh and put under GNUSTEP_USER_ROOT.
|
||||
* setlocaltz.sh: New file.
|
||||
* MediaBook.func: Add help for new commands.
|
||||
|
||||
1999-02-19 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* subproject.make: New file.
|
||||
|
|
|
|||
18
brain.make
18
brain.make
|
|
@ -218,10 +218,10 @@ SYSTEM_LIBS =
|
|||
# then add X headers and libraries
|
||||
#
|
||||
ifeq ($(GUI_BACKEND_LIB),xdps)
|
||||
SYSTEM_INCLUDES = $(X_INCLUDE) $(TIFF_INCLUDE) $(JPEG_INCLUDE)
|
||||
SYSTEM_INCLUDES = $(TIFF_INCLUDE) $(JPEG_INCLUDE) $(X_INCLUDE)
|
||||
SYSTEM_LDFLAGS =
|
||||
SYSTEM_LIB_DIR = $(X_LIBS) $(TIFF_LIB) $(JPEG_LIB)
|
||||
SYSTEM_LIBS = -ltiff -ljpeg -ldpstk -ldps -lpsres -lX11
|
||||
SYSTEM_LIB_DIR = $(TIFF_LIB) $(JPEG_LIB) $(X_LIBS)
|
||||
SYSTEM_LIBS = -ltiff $(JPEG) -ldpstk -ldps -lpsres -lX11
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
@ -229,17 +229,17 @@ endif
|
|||
# then add X headers and libraries
|
||||
#
|
||||
ifeq ($(GUI_BACKEND_LIB),xraw)
|
||||
SYSTEM_INCLUDES = $(X_INCLUDE) $(TIFF_INCLUDE) $(JPEG_INCLUDE)
|
||||
SYSTEM_INCLUDES = $(TIFF_INCLUDE) $(JPEG_INCLUDE) $(X_INCLUDE)
|
||||
SYSTEM_LDFLAGS =
|
||||
SYSTEM_LIB_DIR = $(X_LIBS) $(TIFF_LIB) $(JPEG_LIB)
|
||||
SYSTEM_LIBS = -ltiff -ljpeg -lX11
|
||||
SYSTEM_LIB_DIR = $(TIFF_LIB) $(JPEG_LIB) $(X_LIBS)
|
||||
SYSTEM_LIBS = -ltiff $(JPEG) -lX11
|
||||
endif
|
||||
|
||||
ifeq ($(GUI_BACKEND_LIB),xgps)
|
||||
SYSTEM_INCLUDES = $(X_INCLUDE) $(TIFF_INCLUDE) $(JPEG_INCLUDE)
|
||||
SYSTEM_INCLUDES = $(TIFF_INCLUDE) $(JPEG_INCLUDE) $(X_INCLUDE)
|
||||
SYSTEM_LDFLAGS =
|
||||
SYSTEM_LIB_DIR = $(X_LIBS) $(TIFF_LIB) $(JPEG_LIB)
|
||||
SYSTEM_LIBS = -ltiff -ljpeg -lX11
|
||||
SYSTEM_LIB_DIR = $(TIFF_LIB) $(JPEG_LIB) $(X_LIBS)
|
||||
SYSTEM_LIBS = -ltiff $(JPEG) -lX11
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ JPEG_LIB := @JPEG_LIB@
|
|||
ifeq ($(JPEG_LIB),-LNONE)
|
||||
JPEG_LIB=
|
||||
endif
|
||||
|
||||
JPEG = @JPEG@
|
||||
|
||||
DPS_DEFINE=@DPS_DEFINE@
|
||||
|
||||
|
|
|
|||
114
configure
vendored
114
configure
vendored
|
|
@ -1611,13 +1611,11 @@ fi
|
|||
|
||||
|
||||
if test "x$JPEG_LIB" = x; then
|
||||
jpeg_check_lib_save_lib=${LIBS}
|
||||
LIBS="-L${with_jpeg_library} ${LIBS}"
|
||||
jpeg_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-I${with_jpeg_include} ${CPPFLAGS}"
|
||||
jpeg_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-L${with_jpeg_library} -I${with_jpeg_include} ${CPPFLAGS}"
|
||||
|
||||
echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:1621: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
||||
echo "configure:1619: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
||||
ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1625,7 +1623,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1629 "configure"
|
||||
#line 1627 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -1636,7 +1634,7 @@ int main() {
|
|||
jpeg_destroy_decompress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -1655,23 +1653,22 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
jpeg_ok=no
|
||||
echo "configure: warning: *** Cannot find libjpeg ***" 1>&2
|
||||
{ echo "configure: error: *** To build GUI library JPEG library is required ***" 1>&2; exit 1; }
|
||||
fi
|
||||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
echo $ac_n "checking for jpeg.h""... $ac_c" 1>&6
|
||||
echo "configure:1665: checking for jpeg.h" >&5
|
||||
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
|
||||
echo "configure:1661: checking for jpeglib.h" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1667 "configure"
|
||||
#line 1663 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#undef PACKAGE
|
||||
#undef VERSION
|
||||
#undef HAVE_STDLIB_H
|
||||
#include <jpeglib.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -1691,12 +1688,8 @@ rm -f conftest*
|
|||
export JPEG_LIB
|
||||
JPEG_INCLUDE="-I${with_jpeg_include}"
|
||||
export JPEG_INCLUDE
|
||||
else
|
||||
echo "configure: warning: *** Cannot find libjpeg header ***" 1>&2
|
||||
{ echo "configure: error: *** To build GUI library JPEG library is required ***" 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
LIBS="${jpeg_check_lib_save_lib}"
|
||||
CPPFLAGS="${jpeg_check_lib_save_header}"
|
||||
fi
|
||||
|
||||
|
|
@ -1726,21 +1719,47 @@ fi
|
|||
|
||||
|
||||
if test "x$TIFF_LIB" = x; then
|
||||
tiff_check_lib_save_lib=${LIBS}
|
||||
LIBS="-L${with_tiff_library} ${JPEG_LIB} ${LIBS}"
|
||||
tiff_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-I${with_tiff_include} ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
tiff_check_lib_save_header=${CPPFLAGS}
|
||||
tiff_check_lib_save_libs=${LIBS}
|
||||
CPPFLAGS="-L${with_tiff_library} ${JPEG_LIB} -I${with_tiff_include} ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
|
||||
echo $ac_n "checking for -ltiff without -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:1728: checking for -ltiff without -ljpeg" >&5
|
||||
LIBS="-ltiff -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1731 "configure"
|
||||
#include "confdefs.h"
|
||||
char TIFFReadScanline();
|
||||
int main() {
|
||||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
jpeg_notneeded=yes
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
jpeg_notneeded=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
echo "$ac_t""$jpeg_notneeded" 1>&6
|
||||
LIBS=${tiff_check_lib_save_libs}
|
||||
JPEG=
|
||||
if test "$jpeg_notneeded" = no; then
|
||||
JPEG=-ljpeg
|
||||
fi
|
||||
echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
|
||||
echo "configure:1736: checking for TIFFReadScanline in -ltiff" >&5
|
||||
echo "configure:1755: checking for TIFFReadScanline in -ltiff" >&5
|
||||
ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltiff -ljpeg -lm $LIBS"
|
||||
LIBS="-ltiff $JPEG -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1744 "configure"
|
||||
#line 1763 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -1751,7 +1770,7 @@ int main() {
|
|||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -1770,24 +1789,31 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
tiff_ok=no
|
||||
echo "configure: warning: *** Cannot find libtiff ***" 1>&2
|
||||
{ echo "configure: error: *** To build GUI library TIFF library is required ***" 1>&2; exit 1; }
|
||||
echo "configure: warning: Cannot find libtiff" 1>&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)"
|
||||
echo "* You may also have to specify --with-jpeg-library if the jpeg"
|
||||
echo "* Library is needed by tiff"
|
||||
if test "x$CONFIGURING_CORE_LIBRARIES" != x; then
|
||||
{ echo "configure: error: You must have proper libraries installed to compile core" 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$tiff_ok" = yes; then
|
||||
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
|
||||
echo "configure:1781: checking for tiffio.h" >&5
|
||||
echo "configure:1807: checking for tiffio.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1786 "configure"
|
||||
#line 1812 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tiffio.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -1815,17 +1841,22 @@ fi
|
|||
TIFF_INCLUDE="-I${with_tiff_include}"
|
||||
export TIFF_INCLUDE
|
||||
else
|
||||
echo "configure: warning: *** Cannot find libtiff header ***" 1>&2
|
||||
{ echo "configure: error: *** To build GUI library TIFF library is required ***" 1>&2; exit 1; }
|
||||
echo "configure: warning: Cannot find libtiff header tiffio" 1>&2
|
||||
echo "* The GUI library requres the TIFF library"
|
||||
echo "* Use --with-tiff-include to specify the tiff header directory"
|
||||
echo "* if it is not in the usual place(s)"
|
||||
if test "x$CONFIGURING_CORE_LIBRARIES" != x; then
|
||||
{ echo "configure: error: You must have proper libraries installed to compile core" 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
LIBS="${tiff_check_lib_save_lib}"
|
||||
CPPFLAGS="{tiff_check_lib_save_header}"
|
||||
CPPFLAGS="${tiff_check_lib_save_header}"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Setup the library combination
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -1852,7 +1883,7 @@ fi
|
|||
# Check if libobjc was compiled with thread support.
|
||||
#--------------------------------------------------------------------
|
||||
echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6
|
||||
echo "configure:1856: checking whether objc has thread support" >&5
|
||||
echo "configure:1887: checking whether objc has thread support" >&5
|
||||
saved_LIBS="$LIBS"
|
||||
objc_thread_lib=""
|
||||
if test $host_os = linux-gnu; then
|
||||
|
|
@ -1861,11 +1892,11 @@ if test $host_os = linux-gnu; then
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1865 "configure"
|
||||
#line 1896 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -1883,11 +1914,11 @@ fi
|
|||
objc_threaded="-lpcthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1887 "configure"
|
||||
#line 1918 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpcthread"
|
||||
else
|
||||
|
|
@ -1906,11 +1937,11 @@ else
|
|||
objc_threaded="-lthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1910 "configure"
|
||||
#line 1941 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lthread"
|
||||
else
|
||||
|
|
@ -2104,6 +2135,7 @@ s%@X_INCLUDE@%$X_INCLUDE%g
|
|||
s%@X_LIBS@%$X_LIBS%g
|
||||
s%@JPEG_LIB@%$JPEG_LIB%g
|
||||
s%@JPEG_INCLUDE@%$JPEG_INCLUDE%g
|
||||
s%@JPEG@%$JPEG%g
|
||||
s%@TIFF_LIB@%$TIFF_LIB%g
|
||||
s%@TIFF_INCLUDE@%$TIFF_INCLUDE%g
|
||||
s%@ac_cv_library_combo@%$ac_cv_library_combo%g
|
||||
|
|
|
|||
61
configure.in
61
configure.in
|
|
@ -131,21 +131,18 @@ AC_ARG_WITH(jpeg_includes,
|
|||
with_jpeg_include=/usr/local/include)
|
||||
|
||||
AC_DEFUN(AC_CHECK_JPEGLIB,
|
||||
[jpeg_check_lib_save_lib=${LIBS}
|
||||
LIBS="-L$1 ${LIBS}"
|
||||
jpeg_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-I$2 ${CPPFLAGS}"
|
||||
[jpeg_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-L$1 -I$2 ${CPPFLAGS}"
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
|
||||
jpeg_ok=yes,
|
||||
jpeg_ok=no
|
||||
AC_MSG_WARN(*** Cannot find libjpeg ***)
|
||||
AC_MSG_ERROR(*** To build GUI library JPEG library is required ***))
|
||||
jpeg_ok=no)
|
||||
if test "$jpeg_ok" = yes; then
|
||||
AC_MSG_CHECKING([for jpeg.h])
|
||||
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)
|
||||
|
|
@ -156,12 +153,8 @@ if test "$jpeg_ok" = yes; then
|
|||
export JPEG_LIB
|
||||
JPEG_INCLUDE="-I$2"
|
||||
export JPEG_INCLUDE
|
||||
else
|
||||
AC_MSG_WARN(*** Cannot find libjpeg header ***)
|
||||
AC_MSG_ERROR(*** To build GUI library JPEG library is required ***)
|
||||
fi
|
||||
fi
|
||||
LIBS="${jpeg_check_lib_save_lib}"
|
||||
CPPFLAGS="${jpeg_check_lib_save_header}"])
|
||||
|
||||
if test "x$JPEG_LIB" = x; then
|
||||
|
|
@ -182,17 +175,34 @@ AC_ARG_WITH(tiff_includes,
|
|||
with_tiff_include=/usr/local/include)
|
||||
|
||||
AC_DEFUN(AC_CHECK_TIFFLIB,
|
||||
[tiff_check_lib_save_lib=${LIBS}
|
||||
LIBS="-L$1 ${JPEG_LIB} ${LIBS}"
|
||||
tiff_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-I$2 ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
[tiff_check_lib_save_header=${CPPFLAGS}
|
||||
tiff_check_lib_save_libs=${LIBS}
|
||||
CPPFLAGS="-L$1 ${JPEG_LIB} -I$2 ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
|
||||
AC_MSG_CHECKING(for -ltiff without -ljpeg)
|
||||
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
|
||||
AC_CHECK_LIB(tiff, TIFFReadScanline,
|
||||
tiff_ok=yes,
|
||||
tiff_ok=no
|
||||
AC_MSG_WARN(*** Cannot find libtiff ***)
|
||||
AC_MSG_ERROR(*** To build GUI library TIFF library is required ***),
|
||||
-ljpeg -lm)
|
||||
AC_MSG_WARN(Cannot find libtiff)
|
||||
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)"
|
||||
echo "* You may also have to specify --with-jpeg-library if the jpeg"
|
||||
echo "* Library is needed by tiff"
|
||||
if test "x$CONFIGURING_CORE_LIBRARIES" != x; then
|
||||
AC_MSG_ERROR(You must have proper libraries installed to compile core)
|
||||
fi,
|
||||
$JPEG -lm)
|
||||
if test "$tiff_ok" = yes; then
|
||||
AC_CHECK_HEADER(tiffio.h,
|
||||
tiff_ok=yes,
|
||||
|
|
@ -203,17 +213,22 @@ if test "$tiff_ok" = yes; then
|
|||
TIFF_INCLUDE="-I$2"
|
||||
export TIFF_INCLUDE
|
||||
else
|
||||
AC_MSG_WARN(*** Cannot find libtiff header ***)
|
||||
AC_MSG_ERROR(*** To build GUI library TIFF library is required ***)
|
||||
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 "* if it is not in the usual place(s)"
|
||||
if test "x$CONFIGURING_CORE_LIBRARIES" != x; then
|
||||
AC_MSG_ERROR(You must have proper libraries installed to compile core)
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
LIBS="${tiff_check_lib_save_lib}"
|
||||
CPPFLAGS="{tiff_check_lib_save_header}"])
|
||||
CPPFLAGS="${tiff_check_lib_save_header}"])
|
||||
|
||||
if test "x$TIFF_LIB" = x; then
|
||||
AC_CHECK_TIFFLIB(${with_tiff_library}, ${with_tiff_include})
|
||||
fi
|
||||
|
||||
AC_SUBST(JPEG)
|
||||
AC_SUBST(TIFF_LIB)
|
||||
AC_SUBST(TIFF_INCLUDE)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue