Changeset 4194 in orxonox.OLD for orxonox/branches/openAL/configure.ac

Timestamp:

May 16, 2005, 1:33:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: merged trunk back to openAL
merged with command:

svn merge ../trunk/ openAL/ -r 3920:HEAD

no conflicts at all

Location:

orxonox/branches/openAL

Files:

• . (modified) (1 prop)
• configure.ac (modified) (7 diffs)

orxonox/branches/openAL

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/openAL/configure.ac

@@ -23 +23 @@
 #########################
 AC_PREREQ(2.56)
-AC_INIT(orxonox, 0.2.2-pre-alpha, [orxonox-dev at mail.datacore.ch])
+AC_INIT(orxonox, 0.2.3-pre-alpha, [orxonox-dev at mail.datacore.ch])
 
 ## Detect the canonical host and target build environment.
@@ -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
@@ -218 +191 @@
 #--------------------#
 AC_PATH_PROG(GPROF, gprof)
+
+#-------------------------#
+# checking for pkg-config #
+#-------------------------#
+if test x$def_gtk = xyes; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config)
+fi
+
 
 #########################
@@ -482 +463 @@
 #-----#
 if test x$def_gtk = xyes; then 
-
         #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
         AC_MSG_CHECKING([for gtk2.0])
-        if `pkg-config --exists gtk+-2.0`; then
+        if `$PKG_CONFIG --exists gtk+-2.0`; then
                 echo "yes"
                 have_gtk2=yes
-                GTK2_LIBS=`pkg-config --libs gtk+-2.0`
-                GTK2_CFLAGS=`pkg-config --cflags gtk+-2.0`
+                GTK2_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
+                GTK2_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
                 AC_DEFINE_UNQUOTED(HAVE_GTK2, 1, [if we have GTK2])
+                if test $DEBUG -ge 3; then
+                 echo "cflags: $GTK2_CFLAGS"
+                 echo "libs: $GTK2_LIBS"
+                fi
         else
                 echo "no"
@@ -499 +483 @@
 AC_SUBST(GTK2_CFLAGS)
 AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes)
-
-#---------#
-# 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)
 
 #---------#
@@ -541 +504 @@
 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
-
 
 #--------#

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+