Changeset 3271 in orxonox.OLD for orxonox/branches/updater/configure

Timestamp:

Dec 24, 2004, 6:29:38 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: threads are cool after all. trying again.

File:

• orxonox/branches/updater/configure (modified) (6 diffs)

orxonox/branches/updater/configure

@@ -312 +312 @@
 #endif"
 
-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'
+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'
 ac_subst_files=''
 
@@ -872 +872 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --without-gtk           Prevents GTK from being loaded
+  --without-gthread       Prevents gThread from being loaded
   --without-curl          Prevents libcURL from being loaded
   --without-sdl-image     Prevents SDL_image from being loaded
@@ -3887 +3888 @@
 fi
 
+## gThread-disabled
+echo "$as_me:$LINENO: checking if gThread should be enabled" >&5
+echo $ECHO_N "checking if gThread should be enabled... $ECHO_C" >&6
+
+# Check whether --with-gthread or --without-gthread was given.
+if test "${with_gthread+set}" = set; then
+  withval="$with_gthread"
+  def_gthread=no
+else
+  def_gthread=yes
+fi;
+if test "$def_gthread" = yes; then
+  echo "yes"
+fi
+if test "$def_gthread" = no; then
+  echo "no"
+fi
+
 ## libCurl disabled?
 echo "$as_me:$LINENO: checking if libcURL should be enabled" >&5
@@ -6672 +6691 @@
 
 
+## checking for gThread
+if test "$def_gthread" = yes; then
+
+        echo "$as_me:$LINENO: checking for gthread" >&5
+echo $ECHO_N "checking for gthread... $ECHO_C" >&6
+        if `pkg-config --exists gthread-2.0`; then
+                echo "yes"
+                have_gthread=yes
+                GTHREAD_LIBS=`pkg-config --libs gthread-2.0`
+                GTHREAD_CFLAGS=`pkg-config --cflags gthread-2.0`
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_GTHREAD 1
+_ACEOF
+
+        else
+                echo "no"
+        fi
+
+fi
+
+
+
+
+if test x$have_gthread = xyes; then
+  HAVE_GTHREAD_TRUE=
+  HAVE_GTHREAD_FALSE='#'
+else
+  HAVE_GTHREAD_TRUE='#'
+  HAVE_GTHREAD_FALSE=
+fi
+
+
 ## checking for libcURL
 if test "$def_curl" = yes; then
@@ -7935 +7987 @@
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"HAVE_GTK2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_GTHREAD_TRUE}" && test -z "${HAVE_GTHREAD_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTHREAD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_GTHREAD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
@@ -8546 +8605 @@
 s,@HAVE_GTK2_TRUE@,$HAVE_GTK2_TRUE,;t t
 s,@HAVE_GTK2_FALSE@,$HAVE_GTK2_FALSE,;t t
+s,@GTHREAD_LIBS@,$GTHREAD_LIBS,;t t
+s,@GTHREAD_CFLAGS@,$GTHREAD_CFLAGS,;t t
+s,@HAVE_GTHREAD_TRUE@,$HAVE_GTHREAD_TRUE,;t t
+s,@HAVE_GTHREAD_FALSE@,$HAVE_GTHREAD_FALSE,;t t
 s,@CURL_LIBS@,$CURL_LIBS,;t t
 s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t