From b5cee563cbfa0a58680b307bc7bc142904db26e9 Mon Sep 17 00:00:00 2001 From: Adam Fedor Date: Thu, 25 Apr 2002 02:09:27 +0000 Subject: [PATCH] better check for backend git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@13538 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 ++ configure | 211 ++++++++++++++++++++++++++------------------------- configure.in | 23 +++--- 3 files changed, 125 insertions(+), 114 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4d4a53..89dad89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-24 Adam Fedor + + * configure.in: Don't enable wraster support if --with-wraster=none. + Print error if no backend server or graphics configured. + 2002-04-23 Adam Fedor * Headers/x11/XGServer.h: Rework to handle multiple screens. diff --git a/configure b/configure index ec75d52..443f22a 100755 --- a/configure +++ b/configure @@ -1070,23 +1070,25 @@ else echo "$ac_t""no" 1>&6 gs_cv_have_wraster=no fi - +if test "x$with_wraster" = "xnone"; then + gs_cv_have_wraster=no +fi if test "$gs_cv_have_wraster" = yes; then for ac_hdr in wraster.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1080: checking for $ac_hdr" >&5 +echo "configure:1082: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1092: \"$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* @@ -1141,7 +1143,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1145: checking for X" >&5 +echo "configure:1147: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1203,12 +1205,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1214: \"$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* @@ -1277,14 +1279,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1390,17 +1392,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:1394: checking whether -R must be followed by a space" >&5 +echo "configure:1396: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -1416,14 +1418,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -1455,7 +1457,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:1459: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1461: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1463,7 +1465,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1480: \"$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 @@ -1496,7 +1498,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:1500: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1502: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1504,7 +1506,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1521: \"$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 @@ -1544,12 +1546,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1548: checking for gethostbyname" >&5 +echo "configure:1550: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1593,7 +1595,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1597: checking for gethostbyname in -lnsl" >&5 +echo "configure:1599: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1601,7 +1603,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1618: \"$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 @@ -1642,12 +1644,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1646: checking for connect" >&5 +echo "configure:1648: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1691,7 +1693,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1695: checking for connect in -lsocket" >&5 +echo "configure:1697: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1699,7 +1701,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1716: \"$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 @@ -1734,12 +1736,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:1738: checking for remove" >&5 +echo "configure:1740: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -1783,7 +1785,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1787: checking for remove in -lposix" >&5 +echo "configure:1789: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1791,7 +1793,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1808: \"$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 @@ -1826,12 +1828,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1830: checking for shmat" >&5 +echo "configure:1832: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -1875,7 +1877,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:1879: checking for shmat in -lipc" >&5 +echo "configure:1881: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1883,7 +1885,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1900: \"$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 @@ -1927,7 +1929,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:1931: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:1933: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1935,7 +1937,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1952: \"$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 @@ -1984,7 +1986,7 @@ if test $set_x_paths = yes; then CPPFLAGS="${GRAPHIC_CFLAGS} ${GRAPHIC_LFLAGS} ${CPPFLAGS}" LIBS="${GRAPHIC_LIBS} ${LIBS}" echo $ac_n "checking for main in -lXext""... $ac_c" 1>&6 -echo "configure:1988: checking for main in -lXext" >&5 +echo "configure:1990: checking for main in -lXext" >&5 ac_lib_var=`echo Xext'_'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 @@ -1992,14 +1994,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2005: \"$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 @@ -2027,7 +2029,7 @@ fi fi LIBS="${GRAPHIC_LIBS} ${LIBS}" echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6 -echo "configure:2031: checking for main in -lXmu" >&5 +echo "configure:2033: 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 @@ -2035,14 +2037,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2048: \"$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 @@ -2109,17 +2111,17 @@ for ac_hdr in DPS/dpsclient.h 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:2113: checking for $ac_hdr" >&5 +echo "configure:2115: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2125: \"$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* @@ -2178,7 +2180,7 @@ save_libs=${LIBS} CPPFLAGS="${GRAPHIC_CFLAGS} ${GRAPHIC_LFLAGS} ${CPPFLAGS}" LIBS="${GRAPHIC_LIBS} ${LIBS}" echo $ac_n "checking for XftFontOpen in -lXft""... $ac_c" 1>&6 -echo "configure:2182: checking for XftFontOpen in -lXft" >&5 +echo "configure:2184: checking for XftFontOpen in -lXft" >&5 ac_lib_var=`echo Xft'_'XftFontOpen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2186,7 +2188,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXft $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2203: \"$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 @@ -2220,17 +2222,17 @@ fi ac_safe=`echo "X11/Xft/Xft.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xft/Xft.h""... $ac_c" 1>&6 -echo "configure:2224: checking for X11/Xft/Xft.h" >&5 +echo "configure:2226: checking for X11/Xft/Xft.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2236: \"$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* @@ -2259,7 +2261,7 @@ if test "$have_xft" = yes -a "$ac_cv_header_X11_Xft_Xft_h" = yes; then EOF echo $ac_n "checking for XftDrawStringUtf8 in -lXft""... $ac_c" 1>&6 -echo "configure:2263: checking for XftDrawStringUtf8 in -lXft" >&5 +echo "configure:2265: checking for XftDrawStringUtf8 in -lXft" >&5 ac_lib_var=`echo Xft'_'XftDrawStringUtf8 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2267,7 +2269,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXft $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2284: \"$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 @@ -2369,7 +2371,7 @@ if test $gs_cv_have_wraster = no -o $set_x_paths = yes; then CPPFLAGS="${with_jpeg_library} ${with_jpeg_include} ${CPPFLAGS}" echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:2373: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:2375: 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 @@ -2377,7 +2379,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2394: \"$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 @@ -2411,9 +2413,9 @@ fi if test "$jpeg_ok" = yes; then echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:2415: checking for jpeglib.h" >&5 +echo "configure:2417: checking for jpeglib.h" >&5 cat > conftest.$ac_ext < #undef PACKAGE @@ -2422,7 +2424,7 @@ echo "configure:2415: checking for jpeglib.h" >&5 #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2428: \"$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* @@ -2486,7 +2488,7 @@ if test $gs_cv_have_wraster = no -o $set_x_paths = yes; then tiff_check_lib_save_libs=${LIBS} CPPFLAGS="${with_tiff_library} ${JPEG_LIB} ${with_tiff_include} ${JPEG_INCLUDE} ${CPPFLAGS}" echo $ac_n "checking for main in -lz""... $ac_c" 1>&6 -echo "configure:2490: checking for main in -lz" >&5 +echo "configure:2492: 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 @@ -2494,14 +2496,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2507: \"$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 @@ -2524,17 +2526,17 @@ fi echo $ac_n "checking for -ltiff without -ljpeg nor -lz""... $ac_c" 1>&6 -echo "configure:2528: checking for -ltiff without -ljpeg nor -lz" >&5 +echo "configure:2530: checking for -ltiff without -ljpeg nor -lz" >&5 LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* jpeg_notneeded=yes else @@ -2553,17 +2555,17 @@ fi if test $HAVE_LIBZ = 1; then echo $ac_n "checking for -ltiff without -lz""... $ac_c" 1>&6 -echo "configure:2557: checking for -ltiff without -lz" >&5 +echo "configure:2559: checking for -ltiff without -lz" >&5 LIBS="-ltiff $JPEG -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* libz_notneeded=yes else @@ -2581,7 +2583,7 @@ rm -f conftest* fi echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6 -echo "configure:2585: checking for TIFFReadScanline in -ltiff" >&5 +echo "configure:2587: 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 @@ -2589,7 +2591,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $JPEG -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2606: \"$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 @@ -2624,17 +2626,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:2628: checking for tiffio.h" >&5 +echo "configure:2630: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2640: \"$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* @@ -2684,17 +2686,17 @@ save_CPPFLAGS=${CPPFLAGS} CPPFLAGS="$CPPFLAGS $GRAPHIC_CFLAGS" ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 -echo "configure:2688: checking for X11/extensions/XShm.h" >&5 +echo "configure:2690: checking for X11/extensions/XShm.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2700: \"$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* @@ -2728,7 +2730,7 @@ save_libs=${LIBS} CPPFLAGS="${GRAPHIC_CFLAGS} ${GRAPHIC_LFLAGS} ${CPPFLAGS}" LIBS="${GRAPHIC_LIBS} ${LIBS}" echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:2732: checking for main in -lgdi32" >&5 +echo "configure:2734: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'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 @@ -2736,14 +2738,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdi32 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2749: \"$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 @@ -2794,7 +2796,7 @@ exdps=no ex11=no ewin32=no ewinlib=no -if test $gs_cv_have_wraster = yes -o $x_includes != NONE; then +if test $gs_cv_have_wraster = yes -o "$x_includes" != "NONE"; then exlib=yes ex11=yes fi @@ -2841,7 +2843,7 @@ fi echo $ac_n "checking Backend Server""... $ac_c" 1>&6 -echo "configure:2845: checking Backend Server" >&5 +echo "configure:2847: checking Backend Server" >&5 if test "x$enable_win32" = "xyes"; then BUILD_WIN32=yes @@ -2850,10 +2852,7 @@ if test "x$enable_win32" = "xyes"; then EOF echo "$ac_t""win32" 1>&6 - # Only one server allowed - enable_x11=no -fi -if test "x$enable_x11" = "xyes"; then +elif test "x$enable_x11" = "xyes"; then BUILD_X11=yes cat >> confdefs.h <<\EOF @@ -2861,10 +2860,13 @@ if test "x$enable_x11" = "xyes"; then EOF echo "$ac_t""x11" 1>&6 +else + echo "$ac_t""None" 1>&6 + { echo "configure: error: No Backend server configured. Report bug to bug-gnustep@gnu.org" 1>&2; exit 1; } fi echo $ac_n "checking Backend Graphics""... $ac_c" 1>&6 -echo "configure:2868: checking Backend Graphics" >&5 +echo "configure:2870: checking Backend Graphics" >&5 if test "x$enable_winlib" = "xyes"; then BUILD_WINLIB=yes @@ -2875,8 +2877,7 @@ EOF echo "$ac_t""win32" 1>&6 enable_xdps=no enable_xlib=no -fi -if test "x$enable_xdps" = "xyes"; then +elif test "x$enable_xdps" = "xyes"; then BUILD_XDPS=yes cat >> confdefs.h <<\EOF @@ -2886,8 +2887,7 @@ EOF echo "$ac_t""xdps" 1>&6 GRAPHIC_LIBS="-ldpstk -ldps -lpsres -lXt $X_PRE_LIBS $GRAPHIC_LIBS" enable_xlib=no -fi -if test "x$enable_xlib" = "xyes"; then +elif test "x$enable_xlib" = "xyes"; then BUILD_XLIB=yes cat >> confdefs.h <<\EOF @@ -2895,6 +2895,9 @@ if test "x$enable_xlib" = "xyes"; then EOF echo "$ac_t""xlib" 1>&6 +else + echo "$ac_t""None" 1>&6 + echo "configure: warning: No Backend graphics lib. Report bug to bug-gnustep@gnu.org" 1>&2 fi #-------------------------------------------------------------------- @@ -2907,7 +2910,7 @@ if test "${with_name+set}" = set; then fi echo $ac_n "checking Backend name""... $ac_c" 1>&6 -echo "configure:2911: checking Backend name" >&5 +echo "configure:2914: checking Backend name" >&5 if test "x$with_name" = "x"; then BACKEND_NAME=back else diff --git a/configure.in b/configure.in index 3e1a76a..807f85c 100644 --- a/configure.in +++ b/configure.in @@ -87,7 +87,9 @@ CPPFLAGS="$1 $2 ${CPPFLAGS}" LIBS="$3 $LIBS" # Check for RFillImage which is only in version 2.0 of libwraster -AC_CHECK_LIB(wraster, RFillImage, gs_cv_have_wraster=yes, gs_cv_have_wraster=no) +AC_CHECK_LIB(wraster, RFillImage, gs_cv_have_wraster=yes, gs_cv_have_wraster=no)if test "x$with_wraster" = "xnone"; then + gs_cv_have_wraster=no +fi if test "$gs_cv_have_wraster" = yes; then AC_CHECK_HEADERS(wraster.h, gs_cv_have_wraster=yes, gs_cv_have_wraster=no) fi @@ -395,7 +397,7 @@ exdps=no ex11=no ewin32=no ewinlib=no -if test $gs_cv_have_wraster = yes -o $x_includes != NONE; then +if test $gs_cv_have_wraster = yes -o "$x_includes" != "NONE"; then exlib=yes ex11=yes fi @@ -422,14 +424,14 @@ if test "x$enable_win32" = "xyes"; then AC_SUBST(BUILD_WIN32) AC_DEFINE(BUILD_WIN32) AC_MSG_RESULT(win32) - # Only one server allowed - enable_x11=no -fi -if test "x$enable_x11" = "xyes"; then +elif test "x$enable_x11" = "xyes"; then BUILD_X11=yes AC_SUBST(BUILD_X11) AC_DEFINE(BUILD_X11) AC_MSG_RESULT(x11) +else + AC_MSG_RESULT(None) + AC_MSG_ERROR(No Backend server configured. Report bug to bug-gnustep@gnu.org) fi AC_MSG_CHECKING(Backend Graphics) @@ -440,20 +442,21 @@ if test "x$enable_winlib" = "xyes"; then AC_MSG_RESULT(win32) enable_xdps=no enable_xlib=no -fi -if test "x$enable_xdps" = "xyes"; then +elif test "x$enable_xdps" = "xyes"; then BUILD_XDPS=yes AC_SUBST(BUILD_XDPS) AC_DEFINE(BUILD_XDPS) AC_MSG_RESULT(xdps) GRAPHIC_LIBS="-ldpstk -ldps -lpsres -lXt $X_PRE_LIBS $GRAPHIC_LIBS" enable_xlib=no -fi -if test "x$enable_xlib" = "xyes"; then +elif test "x$enable_xlib" = "xyes"; then BUILD_XLIB=yes AC_SUBST(BUILD_XLIB) AC_DEFINE(BUILD_XLIB) AC_MSG_RESULT(xlib) +else + AC_MSG_RESULT(None) + AC_MSG_WARN(No Backend graphics lib. Report bug to bug-gnustep@gnu.org) fi #--------------------------------------------------------------------