Changeset 3423 in orxonox.OLD for orxonox/trunk/configure.ac

Timestamp:

Feb 27, 2005, 7:11:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/updater back into the trunk
merged with command: svn merge branches/updater trunk -r 3241:HEAD
resolved conflicts in debug.h in favor of the trunk.

File:

• orxonox/trunk/configure.ac (modified) (2 diffs)

orxonox/trunk/configure.ac

@@ -55 +55 @@
   echo "no"
 fi
+
+## gThread-disabled
+AC_MSG_CHECKING([if gThread should be enabled])
+AC_ARG_WITH([gthread], 
+        AC_HELP_STRING( [--without-gthread], 
+        [Prevents gThread from being loaded]), [def_gthread=no], [def_gthread=yes]) 
+if test "$def_gthread" = yes; then 
+  echo "yes"
+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
+
+## libCurl disabled?
+AC_MSG_CHECKING([if libcURL should be enabled])
+AC_ARG_WITH([curl], 
+        AC_HELP_STRING( [--without-curl], 
+        [Prevents libcURL from being loaded]), [def_curl=no], [def_curl=yes]) 
+if test "$def_curl" = yes; then 
+  echo "yes"
+fi 
+if test "$def_curl" = no; then 
+  echo "no"
+fi
+
 ### SDL_image-disable
 def_sdl_image=yes
@@ -353 +390 @@
 AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes)
 
-
-
-#checking for pthread libs
-# AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
-# if test "$FOUND_pthread" = "yes" ; then
-#    LIBS="$LIBS -lpthread"
-# fi
-
-
+## checking for gThread
+if test "$def_gthread" = yes; then 
+
+        AC_MSG_CHECKING([for gthread])
+        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`
+                AC_DEFINE_UNQUOTED(HAVE_GTHREAD, 1, [if we have gThread])
+        else
+                echo "no"
+        fi
+
+fi
+AC_SUBST(GTHREAD_LIBS)
+AC_SUBST(GTHREAD_CFLAGS)
+AM_CONDITIONAL(HAVE_GTHREAD, test x$have_gthread = xyes)
+
+## checking for libcURL
+if test "$def_curl" = yes; then 
+
+ AC_CHECK_HEADERS([curl/curl.h], curlHeader="yes", curlHeader="no")
+ AC_CHECK_LIB([curl], [main], [FOUND_curl=yes])
+ if test x$curlHeader = xyes & test x$FOUND_curl = xyes ; then
+  have_curl=yes
+  CURL_LIBS=`curl-config --libs`
+  CURLCFLAGS=`curl-config --cflags`
+  AC_DEFINE_UNQUOTED(HAVE_CURL, 1, [if we have CURL])
+ else 
+  have_curl=no
+ fi
+
+fi
+AC_SUBST(CURL_LIBS)
+AC_SUBST(CURL_CFLAGS)
+AM_CONDITIONAL(HAVE_CURL, test x$have_curl = xyes)
+
+
+##checking for pthread
+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)
+   if test "$FOUND_pthread" = "yes" ; then
+      LIBS="$LIBS -lpthread"
+   fi
+ fi
+fi
 # FIXME: Replace `main' with a function in `-lm':
  AC_CHECK_LIB([m], [main])