Changeset 3283 in orxonox.OLD

Timestamp:

Dec 26, 2004, 12:24:18 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: now also works, if no pthread is found, but gthread is.

Location:

orxonox/branches/updater

Files:

• configure (modified) (4 diffs)
• configure.ac (modified) (3 diffs)
• src/gui/orxonox_gui_update.cc (modified) (4 diffs)

orxonox/branches/updater/configure

@@ -873 +873 @@
   --without-gtk           Prevents GTK from being loaded
   --without-gthread       Prevents gThread from being loaded
+  --without-pthread       Prevents pthread from being loaded
   --without-curl          Prevents libcURL from being loaded
   --without-sdl-image     Prevents SDL_image from being loaded
@@ -3906 +3907 @@
 fi
 
+## pthread-disabled
+echo "$as_me:$LINENO: checking if pthread should be enabled" >&5
+echo $ECHO_N "checking if pthread should be enabled... $ECHO_C" >&6
+
+# Check whether --with-pthread or --without-pthread was given.
+if test "${with_pthread+set}" = set; then
+  withval="$with_pthread"
+  def_pthread=no
+else
+  def_pthread=yes
+fi;
+if test "$def_pthread" = yes; then
+  echo "yes"
+fi
+if test "$def_pthread" = no; then
+  echo "no"
+fi
+
 ## libCurl disabled?
 echo "$as_me:$LINENO: checking if libcURL should be enabled" >&5
@@ -6970 +6989 @@
 
 ##checking for pthread
-if test x$have_gthread = xyes ; then
+if test x$def_pthread = xyes ; then
+ if test x$have_gthread = xyes ; then
 
 for ac_header in pthread.h
@@ -7188 +7208 @@
       LIBS="$LIBS -lpthread"
    fi
-fi
-
+ fi
+fi
 # FIXME: Replace `main' with a function in `-lm':
 

orxonox/branches/updater/configure.ac

@@ -65 +65 @@
 fi 
 if test "$def_gthread" = no; then 
+  echo "no"
+fi
+
+## pthread-disabled
+AC_MSG_CHECKING([if pthread should be enabled])
+AC_ARG_WITH([pthread], 
+        AC_HELP_STRING( [--without-pthread], 
+        [Prevents pthread from being loaded]), [def_pthread=no], [def_pthread=yes]) 
+if test "$def_pthread" = yes; then 
+  echo "yes"
+fi 
+if test "$def_pthread" = no; then 
   echo "no"
 fi
@@ -404 +416 @@
 
 ##checking for pthread
-if test x$have_gthread = xyes ; then
+if test x$def_pthread = xyes ; then
+ if test x$have_gthread = xyes ; then
   AC_CHECK_HEADERS([pthread.h], pthreadHeader="yes", pthreadHeader="no")
   AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
@@ -410 +423 @@
       LIBS="$LIBS -lpthread"
    fi
-fi
-
+ fi
+fi
 # FIXME: Replace `main' with a function in `-lm':
  AC_CHECK_LIB([m], [main])

orxonox/branches/updater/src/gui/orxonox_gui_update.cc

@@ -318 +318 @@
 void* OrxonoxGuiUpdate::downloadThread(void* fileInfo)
 {
+#ifdef HAVE_PTHREAD_H
   pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
   gdk_threads_enter();
+#endif /* HAVE_PTHREAD_H */
   FileInfo* info = (FileInfo*)fileInfo;
   info->stateButton->disconnectSignal(info->buttonSignal);
@@ -325 +327 @@
 #ifdef HAVE_PTHREAD_H
   info->stateButton->setTitle("cancel");
+  gdk_threads_leave();
 #else /* HAVE_PTHREAD_H */
   info->stateButton->setTitle("please wait");
 #endif /* HAVE_PTHREAD_H */
-  gdk_threads_leave();
   pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
 
@@ -343 +345 @@
 #ifdef HAVE_PTHREAD_H
   pthread_join (*downloadThreadID, NULL);
-#endif /* HAVE_PTHREAD_H */
   gdk_threads_enter();
+#endif /* HAVE_PTHREAD_H */
   if (curlHandle)
     curl_easy_cleanup(curlHandle);
@@ -358 +360 @@
   info->buttonSignal = info->stateButton->connectSignal("button_press_event", info, updateDataFunc);
   isDownloading = false;
+#ifdef HAVE_PTHREAD_H
   gdk_threads_leave();
+#endif /* HAVE_PTHREAD_H */
 
 }