- Timestamp:
- Dec 24, 2004, 10:50:02 AM (20 years ago)
- Location:
- orxonox/branches/updater
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/updater/Makefile.in
r3243 r3262 102 102 EGREP = @EGREP@ 103 103 EXEEXT = @EXEEXT@ 104 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ 105 GTHREAD_LIBS = @GTHREAD_LIBS@ 104 106 GTK2_CFLAGS = @GTK2_CFLAGS@ 105 107 GTK2_LIBS = @GTK2_LIBS@ 106 108 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 107 109 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 110 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@ 111 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@ 108 112 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 109 113 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/branches/updater/configure
r3243 r3262 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 CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE CURL_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 CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS' 315 315 ac_subst_files='' 316 316 … … 872 872 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 873 873 --without-gtk Prevents GTK from being loaded 874 --without-gthread Prevents gThread from being loaded 874 875 --without-curl Prevents libcURL from being loaded 875 876 --without-sdl-image Prevents SDL_image from being loaded … … 3887 3888 fi 3888 3889 3890 ## gThread-disabled 3891 echo "$as_me:$LINENO: checking if gThread should be enabled" >&5 3892 echo $ECHO_N "checking if gThread should be enabled... $ECHO_C" >&6 3893 3894 # Check whether --with-gthread or --without-gthread was given. 3895 if test "${with_gthread+set}" = set; then 3896 withval="$with_gthread" 3897 def_gthread=no 3898 else 3899 def_gthread=yes 3900 fi; 3901 if test "$def_gthread" = yes; then 3902 echo "yes" 3903 fi 3904 if test "$def_gthread" = no; then 3905 echo "no" 3906 fi 3907 3889 3908 ## libCurl disabled? 3890 3909 echo "$as_me:$LINENO: checking if libcURL should be enabled" >&5 … … 6672 6691 6673 6692 6693 ## checking for gThread 6694 if test "$def_gthread" = yes; then 6695 6696 echo "$as_me:$LINENO: checking for gthread" >&5 6697 echo $ECHO_N "checking for gthread... $ECHO_C" >&6 6698 if `pkg-config --exists gthread`; then 6699 echo "yes" 6700 have_gthread=yes 6701 GTHREAD_LIBS=`pkg-config --libs gthread` 6702 GTHREAD_CFLAGS=`pkg-config --cflags gthread` 6703 6704 cat >>confdefs.h <<_ACEOF 6705 #define HAVE_GTHREAD 1 6706 _ACEOF 6707 6708 else 6709 echo "no" 6710 fi 6711 6712 fi 6713 6714 6715 6716 6717 if test x$have_gthread = xyes; then 6718 HAVE_GTHREAD_TRUE= 6719 HAVE_GTHREAD_FALSE='#' 6720 else 6721 HAVE_GTHREAD_TRUE='#' 6722 HAVE_GTHREAD_FALSE= 6723 fi 6724 6725 6674 6726 ## checking for libcURL 6675 6727 if test "$def_curl" = yes; then … … 7935 7987 Usually this means the macro was only invoked conditionally." >&5 7936 7988 echo "$as_me: error: conditional \"HAVE_GTK2\" was never defined. 7989 Usually this means the macro was only invoked conditionally." >&2;} 7990 { (exit 1); exit 1; }; } 7991 fi 7992 if test -z "${HAVE_GTHREAD_TRUE}" && test -z "${HAVE_GTHREAD_FALSE}"; then 7993 { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTHREAD\" was never defined. 7994 Usually this means the macro was only invoked conditionally." >&5 7995 echo "$as_me: error: conditional \"HAVE_GTHREAD\" was never defined. 7937 7996 Usually this means the macro was only invoked conditionally." >&2;} 7938 7997 { (exit 1); exit 1; }; } … … 8546 8605 s,@HAVE_GTK2_TRUE@,$HAVE_GTK2_TRUE,;t t 8547 8606 s,@HAVE_GTK2_FALSE@,$HAVE_GTK2_FALSE,;t t 8607 s,@GTHREAD_LIBS@,$GTHREAD_LIBS,;t t 8608 s,@GTHREAD_CFLAGS@,$GTHREAD_CFLAGS,;t t 8609 s,@HAVE_GTHREAD_TRUE@,$HAVE_GTHREAD_TRUE,;t t 8610 s,@HAVE_GTHREAD_FALSE@,$HAVE_GTHREAD_FALSE,;t t 8548 8611 s,@CURL_LIBS@,$CURL_LIBS,;t t 8549 8612 s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t -
orxonox/branches/updater/configure.ac
r3243 r3262 53 53 fi 54 54 if test "$def_gtk" = no; then 55 echo "no" 56 fi 57 58 ## gThread-disabled 59 AC_MSG_CHECKING([if gThread should be enabled]) 60 AC_ARG_WITH([gthread], 61 AC_HELP_STRING( [--without-gthread], 62 [Prevents gThread from being loaded]), [def_gthread=no], [def_gthread=yes]) 63 if test "$def_gthread" = yes; then 64 echo "yes" 65 fi 66 if test "$def_gthread" = no; then 55 67 echo "no" 56 68 fi … … 352 364 AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes) 353 365 366 ## checking for gThread 367 if test "$def_gthread" = yes; then 368 369 AC_MSG_CHECKING([for gthread]) 370 if `pkg-config --exists gthread`; then 371 echo "yes" 372 have_gthread=yes 373 GTHREAD_LIBS=`pkg-config --libs gthread` 374 GTHREAD_CFLAGS=`pkg-config --cflags gthread` 375 AC_DEFINE_UNQUOTED(HAVE_GTHREAD, 1, [if we have gThread]) 376 else 377 echo "no" 378 fi 379 380 fi 381 AC_SUBST(GTHREAD_LIBS) 382 AC_SUBST(GTHREAD_CFLAGS) 383 AM_CONDITIONAL(HAVE_GTHREAD, test x$have_gthread = xyes) 384 354 385 ## checking for libcURL 355 386 if test "$def_curl" = yes; then -
orxonox/branches/updater/src/Makefile.in
r3243 r3262 127 127 EGREP = @EGREP@ 128 128 EXEEXT = @EXEEXT@ 129 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ 130 GTHREAD_LIBS = @GTHREAD_LIBS@ 129 131 GTK2_CFLAGS = @GTK2_CFLAGS@ 130 132 GTK2_LIBS = @GTK2_LIBS@ 131 133 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 132 134 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 135 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@ 136 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@ 133 137 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 134 138 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/branches/updater/src/console/Makefile.in
r3243 r3262 104 104 EGREP = @EGREP@ 105 105 EXEEXT = @EXEEXT@ 106 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ 107 GTHREAD_LIBS = @GTHREAD_LIBS@ 106 108 GTK2_CFLAGS = @GTK2_CFLAGS@ 107 109 GTK2_LIBS = @GTK2_LIBS@ 108 110 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 109 111 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 112 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@ 113 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@ 110 114 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 111 115 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ -
orxonox/branches/updater/src/debug.h
r3212 r3262 1 1 #ifndef _DEBUG_H 2 2 #define _DEBUG_H 3 4 #include <stdio.h> 3 5 4 6 #ifdef DEBUG -
orxonox/branches/updater/src/gui/Makefile.am
r3250 r3262 1 AM_CXXFLAGS=$(GTK2_CFLAGS) $( MSBITFIELDS)2 #AM_LDFLAGS=$(GTK2_LIBS) 3 LIBS=$(GTK2_LIBS) 1 AM_CXXFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) 2 #AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) 3 LIBS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 4 4 5 5 bin_PROGRAMS=gui -
orxonox/branches/updater/src/gui/Makefile.in
r3259 r3262 113 113 EGREP = @EGREP@ 114 114 EXEEXT = @EXEEXT@ 115 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ 116 GTHREAD_LIBS = @GTHREAD_LIBS@ 115 117 GTK2_CFLAGS = @GTK2_CFLAGS@ 116 118 GTK2_LIBS = @GTK2_LIBS@ 117 119 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 118 120 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 121 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@ 122 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@ 119 123 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 120 124 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@ … … 125 129 LDFLAGS = @LDFLAGS@ 126 130 LIBOBJS = @LIBOBJS@ 127 #AM_LDFLAGS=$(GTK2_LIBS) 128 LIBS = $(GTK2_LIBS) 131 #AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) 132 LIBS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 129 133 LTLIBOBJS = @LTLIBOBJS@ 130 134 MAKEINFO = @MAKEINFO@ … … 184 188 target_os = @target_os@ 185 189 target_vendor = @target_vendor@ 186 AM_CXXFLAGS = $(GTK2_CFLAGS) $( MSBITFIELDS)190 AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) 187 191 gui_SOURCES = orxonox_gui.cc \ 188 192 orxonox_gui_gtk.cc \ -
orxonox/branches/updater/src/importer/Makefile.in
r3243 r3262 105 105 EGREP = @EGREP@ 106 106 EXEEXT = @EXEEXT@ 107 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ 108 GTHREAD_LIBS = @GTHREAD_LIBS@ 107 109 GTK2_CFLAGS = @GTK2_CFLAGS@ 108 110 GTK2_LIBS = @GTK2_LIBS@ 109 111 HAVE_CURL_FALSE = @HAVE_CURL_FALSE@ 110 112 HAVE_CURL_TRUE = @HAVE_CURL_TRUE@ 113 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@ 114 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@ 111 115 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@ 112 116 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
Note: See TracChangeset
for help on using the changeset viewer.