mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Fix up searches for X libs
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@6346 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor
parent
3b094b682f
commit
41c3237be0
3 changed files with 145 additions and 88 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2000-03-20 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in (GRAPHIC_LIBS): Check for libXmu if libwraster
|
||||
not found. Add X libs if libwraster not found.
|
||||
|
||||
2000-03-19 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* rules.make: added rule for GSDOC
|
||||
|
|
|
|||
210
configure
vendored
210
configure
vendored
|
|
@ -2520,14 +2520,58 @@ fi
|
|||
fi
|
||||
|
||||
|
||||
if test "x$GRAPHIC_LIBS" = x; then
|
||||
if test -n "$x_includes"; then
|
||||
GRAPHIC_CFLAGS="-I$x_includes $GRAPHIC_CFLAGS"
|
||||
fi
|
||||
if test -n "$x_libraries"; then
|
||||
GRAPHIC_LFLAGS="-L$x_libraries $GRAPHIC_LFLAGS"
|
||||
fi
|
||||
#if test "x$GRAPHIC_LIBS" = x; then
|
||||
GRAPHIC_CFLAGS="$X_CFLAGS"
|
||||
GRAPHIC_LFLAGS="$X_LIBS"
|
||||
GRAPHIC_LIBS="-lXext -lX11 $X_EXTRA_LIBS"
|
||||
|
||||
lib_save_header=${CPPFLAGS}
|
||||
lib_save_libs=${LIBS}
|
||||
CPPFLAGS="${GRAPHIC_CFLAGS} ${GRAPHIC_LFLAGS} ${CPPFLAGS}"
|
||||
LIBS="${GRAPHIC_LIBS} ${LIBS}"
|
||||
echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6
|
||||
echo "configure:2534: checking for main in -lXmu" >&5
|
||||
ac_lib_var=`echo Xmu'_'main | 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="-lXmu $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2542 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
have_xmu=1
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
have_xmu=0
|
||||
fi
|
||||
|
||||
CPPFLAGS="${lib_save_header}"
|
||||
LIBS="${lib_save_libs}"
|
||||
if test $have_xmu = 1; then
|
||||
GRAPHIC_LIBS="-lXmu ${GRAPHIC_LIBS}"
|
||||
fi
|
||||
#fi
|
||||
if test -r $x_includes/X11/DPS; then
|
||||
GRAPHIC_CFLAGS="-I$x_includes/X11 $GRAPHIC_CFLAGS"
|
||||
fi
|
||||
|
|
@ -2569,17 +2613,17 @@ for ac_hdr in DPS/dpsclient.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:2573: checking for $ac_hdr" >&5
|
||||
echo "configure:2617: checking for $ac_hdr" >&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 2578 "configure"
|
||||
#line 2622 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -2610,17 +2654,17 @@ for ac_hdr in DPS/dpsNXargs.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:2614: checking for $ac_hdr" >&5
|
||||
echo "configure:2658: checking for $ac_hdr" >&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 2619 "configure"
|
||||
#line 2663 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -2680,7 +2724,7 @@ if test "x$GRAPHIC_LIBS" = x; then
|
|||
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:2684: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
||||
echo "configure:2728: 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
|
||||
|
|
@ -2688,7 +2732,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2692 "configure"
|
||||
#line 2736 "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
|
||||
|
|
@ -2699,7 +2743,7 @@ int main() {
|
|||
jpeg_destroy_decompress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2722,9 +2766,9 @@ fi
|
|||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
|
||||
echo "configure:2726: checking for jpeglib.h" >&5
|
||||
echo "configure:2770: checking for jpeglib.h" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2728 "configure"
|
||||
#line 2772 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#undef PACKAGE
|
||||
|
|
@ -2733,7 +2777,7 @@ echo "configure:2726: checking for jpeglib.h" >&5
|
|||
#include <jpeglib.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -2783,7 +2827,7 @@ if test "x$GRAPHIC_LIBS" = x; then
|
|||
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 main in -lz""... $ac_c" 1>&6
|
||||
echo "configure:2787: checking for main in -lz" >&5
|
||||
echo "configure:2831: checking for main in -lz" >&5
|
||||
ac_lib_var=`echo z'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2791,14 +2835,14 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2795 "configure"
|
||||
#line 2839 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2821,17 +2865,17 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for -ltiff without -ljpeg nor -lz""... $ac_c" 1>&6
|
||||
echo "configure:2825: checking for -ltiff without -ljpeg nor -lz" >&5
|
||||
echo "configure:2869: checking for -ltiff without -ljpeg nor -lz" >&5
|
||||
LIBS="-ltiff -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2828 "configure"
|
||||
#line 2872 "configure"
|
||||
#include "confdefs.h"
|
||||
char TIFFReadScanline();
|
||||
int main() {
|
||||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
jpeg_notneeded=yes
|
||||
else
|
||||
|
|
@ -2850,17 +2894,17 @@ fi
|
|||
|
||||
if test $HAVE_LIBZ = 1; then
|
||||
echo $ac_n "checking for -ltiff without -lz""... $ac_c" 1>&6
|
||||
echo "configure:2854: checking for -ltiff without -lz" >&5
|
||||
echo "configure:2898: checking for -ltiff without -lz" >&5
|
||||
LIBS="-ltiff $JPEG -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2857 "configure"
|
||||
#line 2901 "configure"
|
||||
#include "confdefs.h"
|
||||
char TIFFReadScanline();
|
||||
int main() {
|
||||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
libz_notneeded=yes
|
||||
else
|
||||
|
|
@ -2878,7 +2922,7 @@ rm -f conftest*
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
|
||||
echo "configure:2882: checking for TIFFReadScanline in -ltiff" >&5
|
||||
echo "configure:2926: 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
|
||||
|
|
@ -2886,7 +2930,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltiff $JPEG -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2890 "configure"
|
||||
#line 2934 "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
|
||||
|
|
@ -2897,7 +2941,7 @@ int main() {
|
|||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2930,17 +2974,17 @@ 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:2934: checking for tiffio.h" >&5
|
||||
echo "configure:2978: 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 2939 "configure"
|
||||
#line 2983 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tiffio.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -3031,7 +3075,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:3035: checking whether objc has thread support" >&5
|
||||
echo "configure:3079: checking whether objc has thread support" >&5
|
||||
extra_LIBS=""
|
||||
case "${target_os}" in
|
||||
solaris*)
|
||||
|
|
@ -3046,50 +3090,6 @@ if test $host_os = linux-gnu; then
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3050 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -fr conftest*
|
||||
objc_threaded=""
|
||||
fi
|
||||
rm -fr conftest*
|
||||
fi
|
||||
|
||||
elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then
|
||||
LIBS="-pthread -lobjc"
|
||||
if test "$cross_compiling" = yes; then
|
||||
objc_threaded="-pthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3072 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:3076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-pthread"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -fr conftest*
|
||||
objc_threaded=""
|
||||
fi
|
||||
rm -fr conftest*
|
||||
fi
|
||||
|
||||
if test x"$objc_threaded" = x""; then
|
||||
LIBS="-lpthread -lobjc"
|
||||
if test "$cross_compiling" = yes; then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3094 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
|
|
@ -3104,6 +3104,50 @@ else
|
|||
objc_threaded=""
|
||||
fi
|
||||
rm -fr conftest*
|
||||
fi
|
||||
|
||||
elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then
|
||||
LIBS="-pthread -lobjc"
|
||||
if test "$cross_compiling" = yes; then
|
||||
objc_threaded="-pthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3116 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:3120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-pthread"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -fr conftest*
|
||||
objc_threaded=""
|
||||
fi
|
||||
rm -fr conftest*
|
||||
fi
|
||||
|
||||
if test x"$objc_threaded" = x""; then
|
||||
LIBS="-lpthread -lobjc"
|
||||
if test "$cross_compiling" = yes; then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3138 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:3142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -fr conftest*
|
||||
objc_threaded=""
|
||||
fi
|
||||
rm -fr conftest*
|
||||
fi
|
||||
|
||||
fi
|
||||
|
|
@ -3113,11 +3157,11 @@ fi
|
|||
objc_threaded="-lpcthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3117 "configure"
|
||||
#line 3161 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:3121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpcthread"
|
||||
else
|
||||
|
|
@ -3136,11 +3180,11 @@ else
|
|||
objc_threaded="-lthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3140 "configure"
|
||||
#line 3184 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lthread"
|
||||
else
|
||||
|
|
|
|||
18
configure.in
18
configure.in
|
|
@ -167,11 +167,19 @@ AC_SUBST(SYSTEM_DEFS)
|
|||
AC_PATH_XTRA
|
||||
|
||||
if test "x$GRAPHIC_LIBS" = x; then
|
||||
if test -n "$x_includes"; then
|
||||
GRAPHIC_CFLAGS="-I$x_includes $GRAPHIC_CFLAGS"
|
||||
fi
|
||||
if test -n "$x_libraries"; then
|
||||
GRAPHIC_LFLAGS="-L$x_libraries $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="$X_CFLAGS"
|
||||
GRAPHIC_LFLAGS="$X_LIBS"
|
||||
GRAPHIC_LIBS="-lXext -lX11 $X_EXTRA_LIBS"
|
||||
|
||||
lib_save_header=${CPPFLAGS}
|
||||
lib_save_libs=${LIBS}
|
||||
CPPFLAGS="${GRAPHIC_CFLAGS} ${GRAPHIC_LFLAGS} ${CPPFLAGS}"
|
||||
LIBS="${GRAPHIC_LIBS} ${LIBS}"
|
||||
AC_CHECK_LIB(Xmu, main, have_xmu=1, have_xmu=0)
|
||||
CPPFLAGS="${lib_save_header}"
|
||||
LIBS="${lib_save_libs}"
|
||||
if test $have_xmu = 1; then
|
||||
GRAPHIC_LIBS="-lXmu ${GRAPHIC_LIBS}"
|
||||
fi
|
||||
fi
|
||||
if test -r $x_includes/X11/DPS; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue