comparison configure @ 49327:b69102c57df8

Fixed --with-gtk
author Jan Djärv <jan.h.d@swipnet.se>
date Mon, 20 Jan 2003 05:35:31 +0000
parents 2cbb0b823e83
children 2867da9cc2b0
comparison
equal deleted inserted replaced
49326:f5372eee5041 49327:b69102c57df8
1888 ;; 1888 ;;
1889 mips-dec-mach_bsd4.3* ) 1889 mips-dec-mach_bsd4.3* )
1890 machine=pmax opsys=mach-bsd4-3 1890 machine=pmax opsys=mach-bsd4-3
1891 ;; 1891 ;;
1892 1892
1893 ## Motorola Delta m88k 1893 ## Motorola Delta machines
1894 m68k-motorola-sysv* | m68000-motorola-sysv* )
1895 machine=delta opsys=usg5-3
1896 if test -z "`type gnucc | grep 'not found'`"
1897 then
1898 if test -s /etc/167config
1899 then CC="gnucc -m68040"
1900 else CC="gnucc -m68881"
1901 fi
1902 else
1903 if test -z "`type gcc | grep 'not found'`"
1904 then CC=gcc
1905 else CC=cc
1906 fi
1907 fi
1908 ;;
1894 m88k-motorola-sysv4* ) 1909 m88k-motorola-sysv4* )
1895 # jbotte@bnr.ca says that UNIX_System_V <hostName> 4.0 R40V4.3 m88k mc88110 1910 # jbotte@bnr.ca says that UNIX_System_V <hostName> 4.0 R40V4.3 m88k mc88110
1896 # needs POSIX_SIGNALS and therefore needs usg5-4-2. 1911 # needs POSIX_SIGNALS and therefore needs usg5-4-2.
1897 # I hope there are not other 4.0 versions for this machine 1912 # I hope there are not other 4.0 versions for this machine
1898 # which really need usg5-4 instead. 1913 # which really need usg5-4 instead.
8078 8093
8079 8094
8080 8095
8081 HAVE_GTK=no 8096 HAVE_GTK=no
8082 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then 8097 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
8083 if test "$USE_X_TOOLKIT" != "none"; then 8098 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
8084 { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5 8099 { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5
8085 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} 8100 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;}
8086 { (exit 1); exit 1; }; }; 8101 { (exit 1); exit 1; }; };
8087 fi 8102 fi
8088 GLIB_REQUIRED=2.0.1 8103 GLIB_REQUIRED=2.0.1