Changeset 4061 in orxonox.OLD for orxonox/trunk
- Timestamp:
- May 5, 2005, 3:10:03 AM (20 years ago)
- Location:
- orxonox/trunk
- Files:
-
- 15 edited
-
Makefile.in (modified) (1 diff)
-
configure (modified) (15 diffs)
-
configure.ac (modified) (3 diffs)
-
src/Makefile.in (modified) (1 diff)
-
src/lib/Makefile.in (modified) (1 diff)
-
src/lib/graphics/Makefile.in (modified) (1 diff)
-
src/lib/graphics/importer/Makefile.in (modified) (1 diff)
-
src/lib/gui/Makefile.in (modified) (1 diff)
-
src/lib/gui/console/Makefile.in (modified) (1 diff)
-
src/lib/gui/gui/Makefile.in (modified) (1 diff)
-
src/lib/gui/gui/gui_gtk.cc (modified) (2 diffs)
-
src/lib/gui/gui/gui_update.cc (modified) (6 diffs)
-
src/lib/gui/gui/gui_update.h (modified) (1 diff)
-
src/subprojects/Makefile.in (modified) (1 diff)
-
src/subprojects/testmain/Makefile.in (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/Makefile.in
r4054 r4061 105 105 EXEEXT = @EXEEXT@ 106 106 GPROF = @GPROF@ 107 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@108 GTHREAD_LIBS = @GTHREAD_LIBS@109 107 GTK2_CFLAGS = @GTK2_CFLAGS@ 110 108 GTK2_LIBS = @GTK2_LIBS@ 111 109 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 112 110 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 113 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@114 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@115 111 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 116 112 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/trunk/configure
r4054 r4061 312 312 #endif" 313 313 314 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOCUMENTATION_TRUE DOCUMENTATION_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE GPROF MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSECURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'314 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOCUMENTATION_TRUE DOCUMENTATION_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE GPROF MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS' 315 315 ac_subst_files='' 316 316 … … 879 879 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 880 880 --without-gtk Prevents GTK from being loaded 881 --without-gthread Prevents gThread from being loaded882 --without-pthread Prevents pthread from being loaded883 881 --without-curl Prevents libcURL from being loaded 884 882 … … 4006 4004 4007 4005 #------------------# 4008 # gThread-disabled #4009 #------------------#4010 echo "$as_me:$LINENO: checking if gThread should be enabled" >&54011 echo $ECHO_N "checking if gThread should be enabled... $ECHO_C" >&64012 4013 # Check whether --with-gthread or --without-gthread was given.4014 if test "${with_gthread+set}" = set; then4015 withval="$with_gthread"4016 def_gthread=no4017 else4018 def_gthread=yes4019 fi;4020 if test x$def_gthread = xyes; then4021 echo "yes"4022 fi4023 if test x$def_gthread = xno; then4024 echo "no"4025 fi4026 4027 #------------------#4028 # pthread-disabled #4029 #------------------#4030 echo "$as_me:$LINENO: checking if pthread should be enabled" >&54031 echo $ECHO_N "checking if pthread should be enabled... $ECHO_C" >&64032 4033 # Check whether --with-pthread or --without-pthread was given.4034 if test "${with_pthread+set}" = set; then4035 withval="$with_pthread"4036 def_pthread=no4037 else4038 def_pthread=yes4039 fi;4040 if test x$def_pthread = xyes; then4041 echo "yes"4042 fi4043 if test x$def_pthread = xno; then4044 echo "no"4045 fi4046 4047 #------------------#4048 4006 # libCurl-disabled # 4049 4007 #------------------# … … 6749 6707 6750 6708 #---------# 6751 # gThread #6752 #---------#6753 if test x$def_gthread = xyes; then6754 6755 echo "$as_me:$LINENO: checking for gthread" >&56756 echo $ECHO_N "checking for gthread... $ECHO_C" >&66757 if `pkg-config --exists gthread-2.0`; then6758 echo "yes"6759 have_gthread=yes6760 GTHREAD_LIBS=`pkg-config --libs gthread-2.0`6761 GTHREAD_CFLAGS=`pkg-config --cflags gthread-2.0`6762 6763 cat >>confdefs.h <<_ACEOF6764 #define HAVE_GTHREAD 16765 _ACEOF6766 6767 else6768 echo "no"6769 fi6770 6771 fi6772 6773 6774 6775 6776 if test x$have_gthread = xyes; then6777 HAVE_GTHREAD_TRUE=6778 HAVE_GTHREAD_FALSE='#'6779 else6780 HAVE_GTHREAD_TRUE='#'6781 HAVE_GTHREAD_FALSE=6782 fi6783 6784 6785 #---------#6786 6709 # libcURL # 6787 6710 #---------# … … 7029 6952 7030 6953 7031 #---------# 7032 # pthread # 7033 #---------# 7034 if test x$def_pthread = xyes ; then 7035 if test x$have_gthread = xyes ; then 7036 7037 for ac_header in pthread.h 6954 #--------# 6955 # efence # 6956 #--------# 6957 if test x$def_efence = xyes ; then 6958 echo "$as_me:$LINENO: checking for main in -lefence" >&5 6959 echo $ECHO_N "checking for main in -lefence... $ECHO_C" >&6 6960 if test "${ac_cv_lib_efence_main+set}" = set; then 6961 echo $ECHO_N "(cached) $ECHO_C" >&6 6962 else 6963 ac_check_lib_save_LIBS=$LIBS 6964 LIBS="-lefence $LIBS" 6965 cat >conftest.$ac_ext <<_ACEOF 6966 /* confdefs.h. */ 6967 _ACEOF 6968 cat confdefs.h >>conftest.$ac_ext 6969 cat >>conftest.$ac_ext <<_ACEOF 6970 /* end confdefs.h. */ 6971 6972 6973 int 6974 main () 6975 { 6976 main (); 6977 ; 6978 return 0; 6979 } 6980 _ACEOF 6981 rm -f conftest.$ac_objext conftest$ac_exeext 6982 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6983 (eval $ac_link) 2>conftest.er1 6984 ac_status=$? 6985 grep -v '^ *+' conftest.er1 >conftest.err 6986 rm -f conftest.er1 6987 cat conftest.err >&5 6988 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6989 (exit $ac_status); } && 6990 { ac_try='test -z "$ac_c_werror_flag" 6991 || test ! -s conftest.err' 6992 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6993 (eval $ac_try) 2>&5 6994 ac_status=$? 6995 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6996 (exit $ac_status); }; } && 6997 { ac_try='test -s conftest$ac_exeext' 6998 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6999 (eval $ac_try) 2>&5 7000 ac_status=$? 7001 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7002 (exit $ac_status); }; }; then 7003 ac_cv_lib_efence_main=yes 7004 else 7005 echo "$as_me: failed program was:" >&5 7006 sed 's/^/| /' conftest.$ac_ext >&5 7007 7008 ac_cv_lib_efence_main=no 7009 fi 7010 rm -f conftest.err conftest.$ac_objext \ 7011 conftest$ac_exeext conftest.$ac_ext 7012 LIBS=$ac_check_lib_save_LIBS 7013 fi 7014 echo "$as_me:$LINENO: result: $ac_cv_lib_efence_main" >&5 7015 echo "${ECHO_T}$ac_cv_lib_efence_main" >&6 7016 if test $ac_cv_lib_efence_main = yes; then 7017 FOUND_efence=yes 7018 fi 7019 7020 if test x$FOUND_efence = xyes ; then 7021 LIBS="$LIBS -lefence" 7022 fi 7023 7024 fi 7025 7026 # FIXME: Replace `main' with a function in `-lm': 7027 7028 echo "$as_me:$LINENO: checking for main in -lm" >&5 7029 echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6 7030 if test "${ac_cv_lib_m_main+set}" = set; then 7031 echo $ECHO_N "(cached) $ECHO_C" >&6 7032 else 7033 ac_check_lib_save_LIBS=$LIBS 7034 LIBS="-lm $LIBS" 7035 cat >conftest.$ac_ext <<_ACEOF 7036 /* confdefs.h. */ 7037 _ACEOF 7038 cat confdefs.h >>conftest.$ac_ext 7039 cat >>conftest.$ac_ext <<_ACEOF 7040 /* end confdefs.h. */ 7041 7042 7043 int 7044 main () 7045 { 7046 main (); 7047 ; 7048 return 0; 7049 } 7050 _ACEOF 7051 rm -f conftest.$ac_objext conftest$ac_exeext 7052 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 7053 (eval $ac_link) 2>conftest.er1 7054 ac_status=$? 7055 grep -v '^ *+' conftest.er1 >conftest.err 7056 rm -f conftest.er1 7057 cat conftest.err >&5 7058 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7059 (exit $ac_status); } && 7060 { ac_try='test -z "$ac_c_werror_flag" 7061 || test ! -s conftest.err' 7062 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7063 (eval $ac_try) 2>&5 7064 ac_status=$? 7065 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7066 (exit $ac_status); }; } && 7067 { ac_try='test -s conftest$ac_exeext' 7068 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7069 (eval $ac_try) 2>&5 7070 ac_status=$? 7071 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7072 (exit $ac_status); }; }; then 7073 ac_cv_lib_m_main=yes 7074 else 7075 echo "$as_me: failed program was:" >&5 7076 sed 's/^/| /' conftest.$ac_ext >&5 7077 7078 ac_cv_lib_m_main=no 7079 fi 7080 rm -f conftest.err conftest.$ac_objext \ 7081 conftest$ac_exeext conftest.$ac_ext 7082 LIBS=$ac_check_lib_save_LIBS 7083 fi 7084 echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5 7085 echo "${ECHO_T}$ac_cv_lib_m_main" >&6 7086 if test $ac_cv_lib_m_main = yes; then 7087 cat >>confdefs.h <<_ACEOF 7088 #define HAVE_LIBM 1 7089 _ACEOF 7090 7091 LIBS="-lm $LIBS" 7092 7093 fi 7094 7095 7096 7097 # Checks for header files. 7098 echo "$as_me:$LINENO: checking for ANSI C header files" >&5 7099 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 7100 if test "${ac_cv_header_stdc+set}" = set; then 7101 echo $ECHO_N "(cached) $ECHO_C" >&6 7102 else 7103 cat >conftest.$ac_ext <<_ACEOF 7104 /* confdefs.h. */ 7105 _ACEOF 7106 cat confdefs.h >>conftest.$ac_ext 7107 cat >>conftest.$ac_ext <<_ACEOF 7108 /* end confdefs.h. */ 7109 #include <stdlib.h> 7110 #include <stdarg.h> 7111 #include <string.h> 7112 #include <float.h> 7113 7114 int 7115 main () 7116 { 7117 7118 ; 7119 return 0; 7120 } 7121 _ACEOF 7122 rm -f conftest.$ac_objext 7123 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 7124 (eval $ac_compile) 2>conftest.er1 7125 ac_status=$? 7126 grep -v '^ *+' conftest.er1 >conftest.err 7127 rm -f conftest.er1 7128 cat conftest.err >&5 7129 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7130 (exit $ac_status); } && 7131 { ac_try='test -z "$ac_c_werror_flag" 7132 || test ! -s conftest.err' 7133 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7134 (eval $ac_try) 2>&5 7135 ac_status=$? 7136 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7137 (exit $ac_status); }; } && 7138 { ac_try='test -s conftest.$ac_objext' 7139 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7140 (eval $ac_try) 2>&5 7141 ac_status=$? 7142 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7143 (exit $ac_status); }; }; then 7144 ac_cv_header_stdc=yes 7145 else 7146 echo "$as_me: failed program was:" >&5 7147 sed 's/^/| /' conftest.$ac_ext >&5 7148 7149 ac_cv_header_stdc=no 7150 fi 7151 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 7152 7153 if test $ac_cv_header_stdc = yes; then 7154 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 7155 cat >conftest.$ac_ext <<_ACEOF 7156 /* confdefs.h. */ 7157 _ACEOF 7158 cat confdefs.h >>conftest.$ac_ext 7159 cat >>conftest.$ac_ext <<_ACEOF 7160 /* end confdefs.h. */ 7161 #include <string.h> 7162 7163 _ACEOF 7164 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 7165 $EGREP "memchr" >/dev/null 2>&1; then 7166 : 7167 else 7168 ac_cv_header_stdc=no 7169 fi 7170 rm -f conftest* 7171 7172 fi 7173 7174 if test $ac_cv_header_stdc = yes; then 7175 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 7176 cat >conftest.$ac_ext <<_ACEOF 7177 /* confdefs.h. */ 7178 _ACEOF 7179 cat confdefs.h >>conftest.$ac_ext 7180 cat >>conftest.$ac_ext <<_ACEOF 7181 /* end confdefs.h. */ 7182 #include <stdlib.h> 7183 7184 _ACEOF 7185 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 7186 $EGREP "free" >/dev/null 2>&1; then 7187 : 7188 else 7189 ac_cv_header_stdc=no 7190 fi 7191 rm -f conftest* 7192 7193 fi 7194 7195 if test $ac_cv_header_stdc = yes; then 7196 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 7197 if test "$cross_compiling" = yes; then 7198 : 7199 else 7200 cat >conftest.$ac_ext <<_ACEOF 7201 /* confdefs.h. */ 7202 _ACEOF 7203 cat confdefs.h >>conftest.$ac_ext 7204 cat >>conftest.$ac_ext <<_ACEOF 7205 /* end confdefs.h. */ 7206 #include <ctype.h> 7207 #if ((' ' & 0x0FF) == 0x020) 7208 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 7209 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 7210 #else 7211 # define ISLOWER(c) \ 7212 (('a' <= (c) && (c) <= 'i') \ 7213 || ('j' <= (c) && (c) <= 'r') \ 7214 || ('s' <= (c) && (c) <= 'z')) 7215 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) 7216 #endif 7217 7218 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 7219 int 7220 main () 7221 { 7222 int i; 7223 for (i = 0; i < 256; i++) 7224 if (XOR (islower (i), ISLOWER (i)) 7225 || toupper (i) != TOUPPER (i)) 7226 exit(2); 7227 exit (0); 7228 } 7229 _ACEOF 7230 rm -f conftest$ac_exeext 7231 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 7232 (eval $ac_link) 2>&5 7233 ac_status=$? 7234 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7235 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 7236 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7237 (eval $ac_try) 2>&5 7238 ac_status=$? 7239 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7240 (exit $ac_status); }; }; then 7241 : 7242 else 7243 echo "$as_me: program exited with status $ac_status" >&5 7244 echo "$as_me: failed program was:" >&5 7245 sed 's/^/| /' conftest.$ac_ext >&5 7246 7247 ( exit $ac_status ) 7248 ac_cv_header_stdc=no 7249 fi 7250 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 7251 fi 7252 fi 7253 fi 7254 echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 7255 echo "${ECHO_T}$ac_cv_header_stdc" >&6 7256 if test $ac_cv_header_stdc = yes; then 7257 7258 cat >>confdefs.h <<\_ACEOF 7259 #define STDC_HEADERS 1 7260 _ACEOF 7261 7262 fi 7263 7264 7265 7266 for ac_header in stdlib.h string.h 7038 7267 do 7039 7268 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 7179 7408 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 7180 7409 _ACEOF 7181 pthreadHeader="yes" 7182 else 7183 pthreadHeader="no" 7410 7184 7411 fi 7185 7412 7186 7413 done 7187 7414 7188 echo "$as_me:$LINENO: checking for main in -lpthread" >&5 7189 echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6 7190 if test "${ac_cv_lib_pthread_main+set}" = set; then 7415 7416 # Checks for typedefs, structures, and compiler characteristics. 7417 echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 7418 echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6 7419 if test "${ac_cv_header_stdbool_h+set}" = set; then 7191 7420 echo $ECHO_N "(cached) $ECHO_C" >&6 7192 7421 else 7193 ac_check_lib_save_LIBS=$LIBS 7194 LIBS="-lpthread $LIBS" 7195 cat >conftest.$ac_ext <<_ACEOF 7422 cat >conftest.$ac_ext <<_ACEOF 7196 7423 /* confdefs.h. */ 7197 7424 _ACEOF … … 7200 7427 /* end confdefs.h. */ 7201 7428 7429 #include <stdbool.h> 7430 #ifndef bool 7431 # error bool is not defined 7432 #endif 7433 #ifndef false 7434 # error false is not defined 7435 #endif 7436 #if false 7437 # error false is not 0 7438 #endif 7439 #ifndef true 7440 # error true is not defined 7441 #endif 7442 #if true != 1 7443 # error true is not 1 7444 #endif 7445 #ifndef __bool_true_false_are_defined 7446 # error __bool_true_false_are_defined is not defined 7447 #endif 7448 7449 struct s { _Bool s: 1; _Bool t; } s; 7450 7451 char a[true == 1 ? 1 : -1]; 7452 char b[false == 0 ? 1 : -1]; 7453 char c[__bool_true_false_are_defined == 1 ? 1 : -1]; 7454 char d[(bool) -0.5 == true ? 1 : -1]; 7455 bool e = &s; 7456 char f[(_Bool) -0.0 == false ? 1 : -1]; 7457 char g[true]; 7458 char h[sizeof (_Bool)]; 7459 char i[sizeof s.t]; 7202 7460 7203 7461 int 7204 7462 main () 7205 7463 { 7206 main ();7464 return !a + !b + !c + !d + !e + !f + !g + !h + !i; 7207 7465 ; 7208 7466 return 0; 7209 7467 } 7210 7468 _ACEOF 7211 rm -f conftest.$ac_objext conftest$ac_exeext7212 if { (eval echo "$as_me:$LINENO: \"$ac_ link\"") >&57213 (eval $ac_ link) 2>conftest.er17469 rm -f conftest.$ac_objext 7470 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 7471 (eval $ac_compile) 2>conftest.er1 7214 7472 ac_status=$? 7215 7473 grep -v '^ *+' conftest.er1 >conftest.err … … 7225 7483 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7226 7484 (exit $ac_status); }; } && 7227 { ac_try='test -s conftest $ac_exeext'7485 { ac_try='test -s conftest.$ac_objext' 7228 7486 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7229 7487 (eval $ac_try) 2>&5 … … 7231 7489 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7232 7490 (exit $ac_status); }; }; then 7233 ac_cv_ lib_pthread_main=yes7491 ac_cv_header_stdbool_h=yes 7234 7492 else 7235 7493 echo "$as_me: failed program was:" >&5 7236 7494 sed 's/^/| /' conftest.$ac_ext >&5 7237 7495 7238 ac_cv_lib_pthread_main=no 7239 fi 7240 rm -f conftest.err conftest.$ac_objext \ 7241 conftest$ac_exeext conftest.$ac_ext 7242 LIBS=$ac_check_lib_save_LIBS 7243 fi 7244 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 7245 echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 7246 if test $ac_cv_lib_pthread_main = yes; then 7247 FOUND_pthread=yes 7248 fi 7249 7250 if test x$FOUND_pthread = xyes ; then 7251 LIBS="$LIBS -lpthread" 7252 fi 7253 fi 7254 fi 7255 7256 7257 #--------# 7258 # efence # 7259 #--------# 7260 if test x$def_efence = xyes ; then 7261 echo "$as_me:$LINENO: checking for main in -lefence" >&5 7262 echo $ECHO_N "checking for main in -lefence... $ECHO_C" >&6 7263 if test "${ac_cv_lib_efence_main+set}" = set; then 7496 ac_cv_header_stdbool_h=no 7497 fi 7498 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 7499 fi 7500 echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 7501 echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6 7502 echo "$as_me:$LINENO: checking for _Bool" >&5 7503 echo $ECHO_N "checking for _Bool... $ECHO_C" >&6 7504 if test "${ac_cv_type__Bool+set}" = set; then 7264 7505 echo $ECHO_N "(cached) $ECHO_C" >&6 7265 7506 else 7266 ac_check_lib_save_LIBS=$LIBS 7267 LIBS="-lefence $LIBS" 7268 cat >conftest.$ac_ext <<_ACEOF 7507 cat >conftest.$ac_ext <<_ACEOF 7269 7508 /* confdefs.h. */ 7270 7509 _ACEOF … … 7272 7511 cat >>conftest.$ac_ext <<_ACEOF 7273 7512 /* end confdefs.h. */ 7274 7275 7513 $ac_includes_default 7276 7514 int 7277 7515 main () 7278 7516 { 7279 main (); 7517 if ((_Bool *) 0) 7518 return 0; 7519 if (sizeof (_Bool)) 7520 return 0; 7280 7521 ; 7281 7522 return 0; 7282 7523 } 7283 7524 _ACEOF 7284 rm -f conftest.$ac_objext conftest$ac_exeext7285 if { (eval echo "$as_me:$LINENO: \"$ac_ link\"") >&57286 (eval $ac_ link) 2>conftest.er17525 rm -f conftest.$ac_objext 7526 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 7527 (eval $ac_compile) 2>conftest.er1 7287 7528 ac_status=$? 7288 7529 grep -v '^ *+' conftest.er1 >conftest.err … … 7298 7539 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7299 7540 (exit $ac_status); }; } && 7300 { ac_try='test -s conftest$ac_exeext'7301 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&57302 (eval $ac_try) 2>&57303 ac_status=$?7304 echo "$as_me:$LINENO: \$? = $ac_status" >&57305 (exit $ac_status); }; }; then7306 ac_cv_lib_efence_main=yes7307 else7308 echo "$as_me: failed program was:" >&57309 sed 's/^/| /' conftest.$ac_ext >&57310 7311 ac_cv_lib_efence_main=no7312 fi7313 rm -f conftest.err conftest.$ac_objext \7314 conftest$ac_exeext conftest.$ac_ext7315 LIBS=$ac_check_lib_save_LIBS7316 fi7317 echo "$as_me:$LINENO: result: $ac_cv_lib_efence_main" >&57318 echo "${ECHO_T}$ac_cv_lib_efence_main" >&67319 if test $ac_cv_lib_efence_main = yes; then7320 FOUND_efence=yes7321 fi7322 7323 if test x$FOUND_efence = xyes ; then7324 LIBS="$LIBS -lefence"7325 fi7326 7327 fi7328 7329 # FIXME: Replace `main' with a function in `-lm':7330 7331 echo "$as_me:$LINENO: checking for main in -lm" >&57332 echo $ECHO_N "checking for main in -lm... $ECHO_C" >&67333 if test "${ac_cv_lib_m_main+set}" = set; then7334 echo $ECHO_N "(cached) $ECHO_C" >&67335 else7336 ac_check_lib_save_LIBS=$LIBS7337 LIBS="-lm $LIBS"7338 cat >conftest.$ac_ext <<_ACEOF7339 /* confdefs.h. */7340 _ACEOF7341 cat confdefs.h >>conftest.$ac_ext7342 cat >>conftest.$ac_ext <<_ACEOF7343 /* end confdefs.h. */7344 7345 7346 int7347 main ()7348 {7349 main ();7350 ;7351 return 0;7352 }7353 _ACEOF7354 rm -f conftest.$ac_objext conftest$ac_exeext7355 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&57356 (eval $ac_link) 2>conftest.er17357 ac_status=$?7358 grep -v '^ *+' conftest.er1 >conftest.err7359 rm -f conftest.er17360 cat conftest.err >&57361 echo "$as_me:$LINENO: \$? = $ac_status" >&57362 (exit $ac_status); } &&7363 { ac_try='test -z "$ac_c_werror_flag"7364 || test ! -s conftest.err'7365 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&57366 (eval $ac_try) 2>&57367 ac_status=$?7368 echo "$as_me:$LINENO: \$? = $ac_status" >&57369 (exit $ac_status); }; } &&7370 { ac_try='test -s conftest$ac_exeext'7371 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&57372 (eval $ac_try) 2>&57373 ac_status=$?7374 echo "$as_me:$LINENO: \$? = $ac_status" >&57375 (exit $ac_status); }; }; then7376 ac_cv_lib_m_main=yes7377 else7378 echo "$as_me: failed program was:" >&57379 sed 's/^/| /' conftest.$ac_ext >&57380 7381 ac_cv_lib_m_main=no7382 fi7383 rm -f conftest.err conftest.$ac_objext \7384 conftest$ac_exeext conftest.$ac_ext7385 LIBS=$ac_check_lib_save_LIBS7386 fi7387 echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&57388 echo "${ECHO_T}$ac_cv_lib_m_main" >&67389 if test $ac_cv_lib_m_main = yes; then7390 cat >>confdefs.h <<_ACEOF7391 #define HAVE_LIBM 17392 _ACEOF7393 7394 LIBS="-lm $LIBS"7395 7396 fi7397 7398 7399 7400 # Checks for header files.7401 echo "$as_me:$LINENO: checking for ANSI C header files" >&57402 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&67403 if test "${ac_cv_header_stdc+set}" = set; then7404 echo $ECHO_N "(cached) $ECHO_C" >&67405 else7406 cat >conftest.$ac_ext <<_ACEOF7407 /* confdefs.h. */7408 _ACEOF7409 cat confdefs.h >>conftest.$ac_ext7410 cat >>conftest.$ac_ext <<_ACEOF7411 /* end confdefs.h. */7412 #include <stdlib.h>7413 #include <stdarg.h>7414 #include <string.h>7415 #include <float.h>7416 7417 int7418 main ()7419 {7420 7421 ;7422 return 0;7423 }7424 _ACEOF7425 rm -f conftest.$ac_objext7426 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&57427 (eval $ac_compile) 2>conftest.er17428 ac_status=$?7429 grep -v '^ *+' conftest.er1 >conftest.err7430 rm -f conftest.er17431 cat conftest.err >&57432 echo "$as_me:$LINENO: \$? = $ac_status" >&57433 (exit $ac_status); } &&7434 { ac_try='test -z "$ac_c_werror_flag"7435 || test ! -s conftest.err'7436 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&57437 (eval $ac_try) 2>&57438 ac_status=$?7439 echo "$as_me:$LINENO: \$? = $ac_status" >&57440 (exit $ac_status); }; } &&7441 7541 { ac_try='test -s conftest.$ac_objext' 7442 7542 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 … … 7445 7545 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7446 7546 (exit $ac_status); }; }; then 7447 ac_cv_ header_stdc=yes7547 ac_cv_type__Bool=yes 7448 7548 else 7449 7549 echo "$as_me: failed program was:" >&5 7450 7550 sed 's/^/| /' conftest.$ac_ext >&5 7451 7551 7452 ac_cv_ header_stdc=no7552 ac_cv_type__Bool=no 7453 7553 fi 7454 7554 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 7455 7456 if test $ac_cv_header_stdc = yes; then 7457 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 7458 cat >conftest.$ac_ext <<_ACEOF 7459 /* confdefs.h. */ 7460 _ACEOF 7461 cat confdefs.h >>conftest.$ac_ext 7462 cat >>conftest.$ac_ext <<_ACEOF 7463 /* end confdefs.h. */ 7464 #include <string.h> 7465 7466 _ACEOF 7467 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 7468 $EGREP "memchr" >/dev/null 2>&1; then 7469 : 7470 else 7471 ac_cv_header_stdc=no 7472 fi 7473 rm -f conftest* 7474 7475 fi 7476 7477 if test $ac_cv_header_stdc = yes; then 7478 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 7479 cat >conftest.$ac_ext <<_ACEOF 7480 /* confdefs.h. */ 7481 _ACEOF 7482 cat confdefs.h >>conftest.$ac_ext 7483 cat >>conftest.$ac_ext <<_ACEOF 7484 /* end confdefs.h. */ 7485 #include <stdlib.h> 7486 7487 _ACEOF 7488 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 7489 $EGREP "free" >/dev/null 2>&1; then 7490 : 7491 else 7492 ac_cv_header_stdc=no 7493 fi 7494 rm -f conftest* 7495 7496 fi 7497 7498 if test $ac_cv_header_stdc = yes; then 7499 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 7500 if test "$cross_compiling" = yes; then 7501 : 7502 else 7503 cat >conftest.$ac_ext <<_ACEOF 7504 /* confdefs.h. */ 7505 _ACEOF 7506 cat confdefs.h >>conftest.$ac_ext 7507 cat >>conftest.$ac_ext <<_ACEOF 7508 /* end confdefs.h. */ 7509 #include <ctype.h> 7510 #if ((' ' & 0x0FF) == 0x020) 7511 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 7512 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 7513 #else 7514 # define ISLOWER(c) \ 7515 (('a' <= (c) && (c) <= 'i') \ 7516 || ('j' <= (c) && (c) <= 'r') \ 7517 || ('s' <= (c) && (c) <= 'z')) 7518 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) 7519 #endif 7520 7521 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 7522 int 7523 main () 7524 { 7525 int i; 7526 for (i = 0; i < 256; i++) 7527 if (XOR (islower (i), ISLOWER (i)) 7528 || toupper (i) != TOUPPER (i)) 7529 exit(2); 7530 exit (0); 7531 } 7532 _ACEOF 7533 rm -f conftest$ac_exeext 7534 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 7535 (eval $ac_link) 2>&5 7536 ac_status=$? 7537 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7538 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 7539 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7540 (eval $ac_try) 2>&5 7541 ac_status=$? 7542 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7543 (exit $ac_status); }; }; then 7544 : 7545 else 7546 echo "$as_me: program exited with status $ac_status" >&5 7547 echo "$as_me: failed program was:" >&5 7548 sed 's/^/| /' conftest.$ac_ext >&5 7549 7550 ( exit $ac_status ) 7551 ac_cv_header_stdc=no 7552 fi 7553 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 7554 fi 7555 fi 7556 fi 7557 echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 7558 echo "${ECHO_T}$ac_cv_header_stdc" >&6 7559 if test $ac_cv_header_stdc = yes; then 7555 fi 7556 echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 7557 echo "${ECHO_T}$ac_cv_type__Bool" >&6 7558 if test $ac_cv_type__Bool = yes; then 7559 7560 cat >>confdefs.h <<_ACEOF 7561 #define HAVE__BOOL 1 7562 _ACEOF 7563 7564 7565 fi 7566 7567 if test $ac_cv_header_stdbool_h = yes; then 7560 7568 7561 7569 cat >>confdefs.h <<\_ACEOF 7562 #define STDC_HEADERS 1 7563 _ACEOF 7564 7565 fi 7566 7567 7568 7569 for ac_header in stdlib.h string.h 7570 #define HAVE_STDBOOL_H 1 7571 _ACEOF 7572 7573 fi 7574 7575 7576 # Checks for library functions. 7577 7578 for ac_header in stdlib.h 7570 7579 do 7571 7580 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 7716 7725 done 7717 7726 7718 7719 # Checks for typedefs, structures, and compiler characteristics.7720 echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&57721 echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&67722 if test "${ac_cv_header_stdbool_h+set}" = set; then7723 echo $ECHO_N "(cached) $ECHO_C" >&67724 else7725 cat >conftest.$ac_ext <<_ACEOF7726 /* confdefs.h. */7727 _ACEOF7728 cat confdefs.h >>conftest.$ac_ext7729 cat >>conftest.$ac_ext <<_ACEOF7730 /* end confdefs.h. */7731 7732 #include <stdbool.h>7733 #ifndef bool7734 # error bool is not defined7735 #endif7736 #ifndef false7737 # error false is not defined7738 #endif7739 #if false7740 # error false is not 07741 #endif7742 #ifndef true7743 # error true is not defined7744 #endif7745 #if true != 17746 # error true is not 17747 #endif7748 #ifndef __bool_true_false_are_defined7749 # error __bool_true_false_are_defined is not defined7750 #endif7751 7752 struct s { _Bool s: 1; _Bool t; } s;7753 7754 char a[true == 1 ? 1 : -1];7755 char b[false == 0 ? 1 : -1];7756 char c[__bool_true_false_are_defined == 1 ? 1 : -1];7757 char d[(bool) -0.5 == true ? 1 : -1];7758 bool e = &s;7759 char f[(_Bool) -0.0 == false ? 1 : -1];7760 char g[true];7761 char h[sizeof (_Bool)];7762 char i[sizeof s.t];7763 7764 int7765 main ()7766 {7767 return !a + !b + !c + !d + !e + !f + !g + !h + !i;7768 ;7769 return 0;7770 }7771 _ACEOF7772 rm -f conftest.$ac_objext7773 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&57774 (eval $ac_compile) 2>conftest.er17775 ac_status=$?7776 grep -v '^ *+' conftest.er1 >conftest.err7777 rm -f conftest.er17778 cat conftest.err >&57779 echo "$as_me:$LINENO: \$? = $ac_status" >&57780 (exit $ac_status); } &&7781 { ac_try='test -z "$ac_c_werror_flag"7782 || test ! -s conftest.err'7783 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&57784 (eval $ac_try) 2>&57785 ac_status=$?7786 echo "$as_me:$LINENO: \$? = $ac_status" >&57787 (exit $ac_status); }; } &&7788 { ac_try='test -s conftest.$ac_objext'7789 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&57790 (eval $ac_try) 2>&57791 ac_status=$?7792 echo "$as_me:$LINENO: \$? = $ac_status" >&57793 (exit $ac_status); }; }; then7794 ac_cv_header_stdbool_h=yes7795 else7796 echo "$as_me: failed program was:" >&57797 sed 's/^/| /' conftest.$ac_ext >&57798 7799 ac_cv_header_stdbool_h=no7800 fi7801 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext7802 fi7803 echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&57804 echo "${ECHO_T}$ac_cv_header_stdbool_h" >&67805 echo "$as_me:$LINENO: checking for _Bool" >&57806 echo $ECHO_N "checking for _Bool... $ECHO_C" >&67807 if test "${ac_cv_type__Bool+set}" = set; then7808 echo $ECHO_N "(cached) $ECHO_C" >&67809 else7810 cat >conftest.$ac_ext <<_ACEOF7811 /* confdefs.h. */7812 _ACEOF7813 cat confdefs.h >>conftest.$ac_ext7814 cat >>conftest.$ac_ext <<_ACEOF7815 /* end confdefs.h. */7816 $ac_includes_default7817 int7818 main ()7819 {7820 if ((_Bool *) 0)7821 return 0;7822 if (sizeof (_Bool))7823 return 0;7824 ;7825 return 0;7826 }7827 _ACEOF7828 rm -f conftest.$ac_objext7829 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&57830 (eval $ac_compile) 2>conftest.er17831 ac_status=$?7832 grep -v '^ *+' conftest.er1 >conftest.err7833 rm -f conftest.er17834 cat conftest.err >&57835 echo "$as_me:$LINENO: \$? = $ac_status" >&57836 (exit $ac_status); } &&7837 { ac_try='test -z "$ac_c_werror_flag"7838 || test ! -s conftest.err'7839 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&57840 (eval $ac_try) 2>&57841 ac_status=$?7842 echo "$as_me:$LINENO: \$? = $ac_status" >&57843 (exit $ac_status); }; } &&7844 { ac_try='test -s conftest.$ac_objext'7845 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&57846 (eval $ac_try) 2>&57847 ac_status=$?7848 echo "$as_me:$LINENO: \$? = $ac_status" >&57849 (exit $ac_status); }; }; then7850 ac_cv_type__Bool=yes7851 else7852 echo "$as_me: failed program was:" >&57853 sed 's/^/| /' conftest.$ac_ext >&57854 7855 ac_cv_type__Bool=no7856 fi7857 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext7858 fi7859 echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&57860 echo "${ECHO_T}$ac_cv_type__Bool" >&67861 if test $ac_cv_type__Bool = yes; then7862 7863 cat >>confdefs.h <<_ACEOF7864 #define HAVE__BOOL 17865 _ACEOF7866 7867 7868 fi7869 7870 if test $ac_cv_header_stdbool_h = yes; then7871 7872 cat >>confdefs.h <<\_ACEOF7873 #define HAVE_STDBOOL_H 17874 _ACEOF7875 7876 fi7877 7878 7879 # Checks for library functions.7880 7881 for ac_header in stdlib.h7882 do7883 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`7884 if eval "test \"\${$as_ac_Header+set}\" = set"; then7885 echo "$as_me:$LINENO: checking for $ac_header" >&57886 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&67887 if eval "test \"\${$as_ac_Header+set}\" = set"; then7888 echo $ECHO_N "(cached) $ECHO_C" >&67889 fi7890 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&57891 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&67892 else7893 # Is the header compilable?7894 echo "$as_me:$LINENO: checking $ac_header usability" >&57895 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&67896 cat >conftest.$ac_ext <<_ACEOF7897 /* confdefs.h. */7898 _ACEOF7899 cat confdefs.h >>conftest.$ac_ext7900 cat >>conftest.$ac_ext <<_ACEOF7901 /* end confdefs.h. */7902 $ac_includes_default7903 #include <$ac_header>7904 _ACEOF7905 rm -f conftest.$ac_objext7906 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&57907 (eval $ac_compile) 2>conftest.er17908 ac_status=$?7909 grep -v '^ *+' conftest.er1 >conftest.err7910 rm -f conftest.er17911 cat conftest.err >&57912 echo "$as_me:$LINENO: \$? = $ac_status" >&57913 (exit $ac_status); } &&7914 { ac_try='test -z "$ac_c_werror_flag"7915 || test ! -s conftest.err'7916 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&57917 (eval $ac_try) 2>&57918 ac_status=$?7919 echo "$as_me:$LINENO: \$? = $ac_status" >&57920 (exit $ac_status); }; } &&7921 { ac_try='test -s conftest.$ac_objext'7922 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&57923 (eval $ac_try) 2>&57924 ac_status=$?7925 echo "$as_me:$LINENO: \$? = $ac_status" >&57926 (exit $ac_status); }; }; then7927 ac_header_compiler=yes7928 else7929 echo "$as_me: failed program was:" >&57930 sed 's/^/| /' conftest.$ac_ext >&57931 7932 ac_header_compiler=no7933 fi7934 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext7935 echo "$as_me:$LINENO: result: $ac_header_compiler" >&57936 echo "${ECHO_T}$ac_header_compiler" >&67937 7938 # Is the header present?7939 echo "$as_me:$LINENO: checking $ac_header presence" >&57940 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&67941 cat >conftest.$ac_ext <<_ACEOF7942 /* confdefs.h. */7943 _ACEOF7944 cat confdefs.h >>conftest.$ac_ext7945 cat >>conftest.$ac_ext <<_ACEOF7946 /* end confdefs.h. */7947 #include <$ac_header>7948 _ACEOF7949 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&57950 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er17951 ac_status=$?7952 grep -v '^ *+' conftest.er1 >conftest.err7953 rm -f conftest.er17954 cat conftest.err >&57955 echo "$as_me:$LINENO: \$? = $ac_status" >&57956 (exit $ac_status); } >/dev/null; then7957 if test -s conftest.err; then7958 ac_cpp_err=$ac_c_preproc_warn_flag7959 ac_cpp_err=$ac_cpp_err$ac_c_werror_flag7960 else7961 ac_cpp_err=7962 fi7963 else7964 ac_cpp_err=yes7965 fi7966 if test -z "$ac_cpp_err"; then7967 ac_header_preproc=yes7968 else7969 echo "$as_me: failed program was:" >&57970 sed 's/^/| /' conftest.$ac_ext >&57971 7972 ac_header_preproc=no7973 fi7974 rm -f conftest.err conftest.$ac_ext7975 echo "$as_me:$LINENO: result: $ac_header_preproc" >&57976 echo "${ECHO_T}$ac_header_preproc" >&67977 7978 # So? What about this header?7979 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in7980 yes:no: )7981 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&57982 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}7983 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&57984 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}7985 ac_header_preproc=yes7986 ;;7987 no:yes:* )7988 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&57989 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}7990 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&57991 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}7992 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&57993 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}7994 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&57995 echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}7996 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&57997 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}7998 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&57999 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}8000 (8001 cat <<\_ASBOX8002 ## ---------------------------------------------- ##8003 ## Report this to orxonox-dev at mail.datacore.ch ##8004 ## ---------------------------------------------- ##8005 _ASBOX8006 ) |8007 sed "s/^/$as_me: WARNING: /" >&28008 ;;8009 esac8010 echo "$as_me:$LINENO: checking for $ac_header" >&58011 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&68012 if eval "test \"\${$as_ac_Header+set}\" = set"; then8013 echo $ECHO_N "(cached) $ECHO_C" >&68014 else8015 eval "$as_ac_Header=\$ac_header_preproc"8016 fi8017 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&58018 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&68019 8020 fi8021 if test `eval echo '${'$as_ac_Header'}'` = yes; then8022 cat >>confdefs.h <<_ACEOF8023 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 18024 _ACEOF8025 8026 fi8027 8028 done8029 8030 7727 echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 8031 7728 echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6 … … 8356 8053 Usually this means the macro was only invoked conditionally." >&5 8357 8054 echo "$as_me: error: conditional \"HAVE_GTK2\" was never defined. 8358 Usually this means the macro was only invoked conditionally." >&2;}8359 { (exit 1); exit 1; }; }8360 fi8361 if test -z "${HAVE_GTHREAD_TRUE}" && test -z "${HAVE_GTHREAD_FALSE}"; then8362 { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTHREAD\" was never defined.8363 Usually this means the macro was only invoked conditionally." >&58364 echo "$as_me: error: conditional \"HAVE_GTHREAD\" was never defined.8365 8055 Usually this means the macro was only invoked conditionally." >&2;} 8366 8056 { (exit 1); exit 1; }; } … … 8986 8676 s,@HAVE_GTK2_TRUE@,$HAVE_GTK2_TRUE,;t t 8987 8677 s,@HAVE_GTK2_FALSE@,$HAVE_GTK2_FALSE,;t t 8988 s,@GTHREAD_LIBS@,$GTHREAD_LIBS,;t t8989 s,@GTHREAD_CFLAGS@,$GTHREAD_CFLAGS,;t t8990 s,@HAVE_GTHREAD_TRUE@,$HAVE_GTHREAD_TRUE,;t t8991 s,@HAVE_GTHREAD_FALSE@,$HAVE_GTHREAD_FALSE,;t t8992 8678 s,@CURL_LIBS@,$CURL_LIBS,;t t 8993 8679 s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t -
orxonox/trunk/configure.ac
r4054 r4061 101 101 102 102 #------------------# 103 # gThread-disabled #104 #------------------#105 AC_MSG_CHECKING([if gThread should be enabled])106 AC_ARG_WITH([gthread],107 AC_HELP_STRING( [--without-gthread],108 [Prevents gThread from being loaded]), [def_gthread=no], [def_gthread=yes])109 if test x$def_gthread = xyes; then110 echo "yes"111 fi112 if test x$def_gthread = xno; then113 echo "no"114 fi115 116 #------------------#117 # pthread-disabled #118 #------------------#119 AC_MSG_CHECKING([if pthread should be enabled])120 AC_ARG_WITH([pthread],121 AC_HELP_STRING( [--without-pthread],122 [Prevents pthread from being loaded]), [def_pthread=no], [def_pthread=yes])123 if test x$def_pthread = xyes; then124 echo "yes"125 fi126 if test x$def_pthread = xno; then127 echo "no"128 fi129 130 #------------------#131 103 # libCurl-disabled # 132 104 #------------------# … … 482 454 483 455 #---------# 484 # gThread #485 #---------#486 if test x$def_gthread = xyes; then487 488 AC_MSG_CHECKING([for gthread])489 if `pkg-config --exists gthread-2.0`; then490 echo "yes"491 have_gthread=yes492 GTHREAD_LIBS=`pkg-config --libs gthread-2.0`493 GTHREAD_CFLAGS=`pkg-config --cflags gthread-2.0`494 AC_DEFINE_UNQUOTED(HAVE_GTHREAD, 1, [if we have gThread])495 else496 echo "no"497 fi498 499 fi500 AC_SUBST(GTHREAD_LIBS)501 AC_SUBST(GTHREAD_CFLAGS)502 AM_CONDITIONAL(HAVE_GTHREAD, test x$have_gthread = xyes)503 504 #---------#505 456 # libcURL # 506 457 #---------# … … 522 473 AC_SUBST(CURL_CFLAGS) 523 474 AM_CONDITIONAL(HAVE_CURL, test x$have_curl = xyes) 524 525 #---------#526 # pthread #527 #---------#528 if test x$def_pthread = xyes ; then529 if test x$have_gthread = xyes ; then530 AC_CHECK_HEADERS([pthread.h], [pthreadHeader="yes"], [pthreadHeader="no"])531 AC_CHECK_LIB([pthread], [main], [FOUND_pthread=yes])532 if test x$FOUND_pthread = xyes ; then533 LIBS="$LIBS -lpthread"534 fi535 fi536 fi537 538 475 539 476 #--------# -
orxonox/trunk/src/Makefile.in
r4057 r4061 195 195 EXEEXT = @EXEEXT@ 196 196 GPROF = @GPROF@ 197 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@198 GTHREAD_LIBS = @GTHREAD_LIBS@199 197 GTK2_CFLAGS = @GTK2_CFLAGS@ 200 198 GTK2_LIBS = @GTK2_LIBS@ 201 199 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 202 200 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 203 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@204 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@205 201 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 206 202 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/trunk/src/lib/Makefile.in
r4054 r4061 89 89 EXEEXT = @EXEEXT@ 90 90 GPROF = @GPROF@ 91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@92 GTHREAD_LIBS = @GTHREAD_LIBS@93 91 GTK2_CFLAGS = @GTK2_CFLAGS@ 94 92 GTK2_LIBS = @GTK2_LIBS@ 95 93 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 96 94 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@99 95 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 100 96 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/trunk/src/lib/graphics/Makefile.in
r4054 r4061 89 89 EXEEXT = @EXEEXT@ 90 90 GPROF = @GPROF@ 91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@92 GTHREAD_LIBS = @GTHREAD_LIBS@93 91 GTK2_CFLAGS = @GTK2_CFLAGS@ 94 92 GTK2_LIBS = @GTK2_LIBS@ 95 93 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 96 94 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@99 95 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 100 96 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/trunk/src/lib/graphics/importer/Makefile.in
r4054 r4061 119 119 EXEEXT = @EXEEXT@ 120 120 GPROF = @GPROF@ 121 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@122 GTHREAD_LIBS = @GTHREAD_LIBS@123 121 GTK2_CFLAGS = @GTK2_CFLAGS@ 124 122 GTK2_LIBS = @GTK2_LIBS@ 125 123 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 126 124 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 127 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@128 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@129 125 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 130 126 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/trunk/src/lib/gui/Makefile.in
r4054 r4061 89 89 EXEEXT = @EXEEXT@ 90 90 GPROF = @GPROF@ 91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@92 GTHREAD_LIBS = @GTHREAD_LIBS@93 91 GTK2_CFLAGS = @GTK2_CFLAGS@ 94 92 GTK2_LIBS = @GTK2_LIBS@ 95 93 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 96 94 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@99 95 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 100 96 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/trunk/src/lib/gui/console/Makefile.in
r4054 r4061 107 107 EXEEXT = @EXEEXT@ 108 108 GPROF = @GPROF@ 109 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@110 GTHREAD_LIBS = @GTHREAD_LIBS@111 109 GTK2_CFLAGS = @GTK2_CFLAGS@ 112 110 GTK2_LIBS = @GTK2_LIBS@ 113 111 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 114 112 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 115 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@116 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@117 113 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 118 114 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/trunk/src/lib/gui/gui/Makefile.in
r4054 r4061 112 112 EXEEXT = @EXEEXT@ 113 113 GPROF = @GPROF@ 114 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@115 GTHREAD_LIBS = @GTHREAD_LIBS@116 114 GTK2_CFLAGS = @GTK2_CFLAGS@ 117 115 GTK2_LIBS = @GTK2_LIBS@ 118 116 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 119 117 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 120 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@121 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@122 118 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 123 119 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/trunk/src/lib/gui/gui/gui_gtk.cc
r4058 r4061 49 49 50 50 #ifdef HAVE_GTK2 51 #ifdef HAVE_GTHREAD52 PRINTF(4)("Initializing the ThreadSystem of the GUI\n");53 g_thread_init(NULL);54 gdk_threads_init();55 #endif /* HAVE_GTHREAD */56 51 gtk_init(&argc, &argv); 57 52 #include "rc" … … 66 61 { 67 62 #ifdef HAVE_GTK2 68 gdk_threads_enter();69 63 gtk_main(); 70 gdk_threads_leave();71 delete Window::mainWindow;72 64 #else /* HAVE_GTK2 */ 73 65 char boolAns = 'y'; -
orxonox/trunk/src/lib/gui/gui/gui_update.cc
r4056 r4061 276 276 bar->setTotalSize(totalSize); 277 277 #ifdef HAVE_GTK2 278 #ifndef HAVE_PTHREAD_H279 278 while(gtk_events_pending()) gtk_main_iteration(); 280 279 #endif 281 #endif282 280 return 0; 283 281 } … … 288 286 CURL* GuiUpdate::curlHandle = NULL; 289 287 290 #ifdef HAVE_PTHREAD_H291 /** \brief The download Thread ID */292 pthread_t* GuiUpdate::downloadThreadID = new pthread_t;293 /** \brief The download Thread ID*/294 pthread_t* GuiUpdate::downloadThreadFinishID = new pthread_t;295 #endif /* HAVE_PTHREAD_H */296 288 /** 297 289 \brief A bool parameter that shows if we are downloading. … … 387 379 if(!isDownloading) 388 380 { 389 #ifdef HAVE_PTHREAD_H390 pthread_join(*downloadThreadFinishID, NULL);391 #endif /* HAVE_PTHREAD_H */392 381 #ifdef HAVE_GTK2 393 382 info->stateButton->disconnectSignal(info->buttonSignal); 394 383 info->buttonSignal = info->stateButton->connectSignal("button_press_event", info, cancelDownload); 395 384 #endif /* HAVE_GTK2 */ 396 #ifdef HAVE_PTHREAD_H397 info->stateButton->setTitle("cancel");398 #else /* HAVE_PTHREAD_H */399 385 info->stateButton->setTitle("please wait"); 400 #endif /* HAVE_PTHREAD_H */401 386 402 //! \todo check if threads really were created.403 #ifdef HAVE_PTHREAD_H404 pthread_create(downloadThreadID, NULL, downloadThread, info);405 pthread_create(downloadThreadFinishID, NULL, downloadThreadFinished, info);406 #else407 387 downloadThread(info); 408 388 downloadThreadFinished(info); 409 #endif /* HAVE_PTHREAD_H */410 389 411 390 // res = curl_easy_perform(curlHandle); … … 439 418 { 440 419 FileInfo* info =(FileInfo*)fileInfo; 441 #ifdef HAVE_PTHREAD_H442 pthread_join(*downloadThreadID, NULL);443 #ifdef HAVE_GTK2444 gdk_threads_enter();445 #endif /* HAVE_GTK2 */446 #endif /* HAVE_PTHREAD_H */447 420 if(curlHandle) 448 421 curl_easy_cleanup(curlHandle); … … 460 433 #endif /* HAVE_GTK2 */ 461 434 isDownloading = false; 462 #ifdef HAVE_PTHREAD_H463 #ifdef HAVE_GTK2464 gdk_threads_leave();465 #endif /* HAVE_GTK2 */466 #endif /* HAVE_PTHREAD_H */467 435 468 436 } … … 479 447 gint GuiUpdate::cancelDownload(GtkWidget* w, GdkEventKey* event, void* bar) 480 448 { 481 #ifdef HAVE_PTHREAD_H 482 pthread_cancel(*downloadThreadID); 483 #else 484 PRINTF(2)("Cannot cancle the Downloading process until after this File, because no threading was enabled\n"); 485 #endif /* HAVE_PTHREAD_H*/ 449 PRINTF(4)("Cannot cancle the Downloading process until after this File\n"); 486 450 } 487 451 #endif /* HAVE_GTK2 */ -
orxonox/trunk/src/lib/gui/gui/gui_update.h
r4056 r4061 82 82 static gint cancelDownload(GtkWidget* w, GdkEventKey* event, void* bar); 83 83 #endif /* HAVE_GTK2 */ 84 #ifdef HAVE_PTHREAD_H85 static pthread_t* downloadThreadID;86 static pthread_t* downloadThreadFinishID;87 #endif /* HAVE_PTHREAD_H */88 84 static bool isDownloading; 85 static bool downloadCanceled; 89 86 90 87 static bool download(void* fileInfo); -
orxonox/trunk/src/subprojects/Makefile.in
r4054 r4061 89 89 EXEEXT = @EXEEXT@ 90 90 GPROF = @GPROF@ 91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@92 GTHREAD_LIBS = @GTHREAD_LIBS@93 91 GTK2_CFLAGS = @GTK2_CFLAGS@ 94 92 GTK2_LIBS = @GTK2_LIBS@ 95 93 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 96 94 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@99 95 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 100 96 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/trunk/src/subprojects/testmain/Makefile.in
r4054 r4061 104 104 EXEEXT = @EXEEXT@ 105 105 GPROF = @GPROF@ 106 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@107 GTHREAD_LIBS = @GTHREAD_LIBS@108 106 GTK2_CFLAGS = @GTK2_CFLAGS@ 109 107 GTK2_LIBS = @GTK2_LIBS@ 110 108 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 111 109 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 112 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@113 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@114 110 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 115 111 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
Note: See TracChangeset
for help on using the changeset viewer.
