Changeset 4063 in orxonox.OLD for orxonox/branches/md2_loader/configure.ac

Timestamp:

May 5, 2005, 2:37:08 PM (20 years ago)

Author:

patrick

Message:

orxonox/branche/md2_loader: merged trunk into my branche

File:

• orxonox/branches/md2_loader/configure.ac (modified) (4 diffs)

orxonox/branches/md2_loader/configure.ac

@@ -39 +39 @@
 #########################
 AC_PROG_CXX
+AC_PROG_RANLIB
 AC_HEADER_STDC
 
@@ -96 +97 @@
 fi 
 if test x$def_gtk = xno; then 
-  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 x$def_gthread = xyes; then 
-  echo "yes"
-fi 
-if test x$def_gthread = xno; 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 x$def_pthread = xyes; then 
-  echo "yes"
-fi 
-if test x$def_pthread = xno; then 
   echo "no"
 fi
@@ -481 +454 @@
 
 #---------#
-# gThread #
-#---------#
-if test x$def_gthread = xyes; 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)
-
-#---------#
 # libcURL #
 #---------#
@@ -521 +473 @@
 AC_SUBST(CURL_CFLAGS)
 AM_CONDITIONAL(HAVE_CURL, test x$have_curl = xyes)
-
-#---------#
-# 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 x$FOUND_pthread = xyes ; then
-      LIBS="$LIBS -lpthread"
-   fi
- fi
-fi
-
 
 #--------#