Revision: 144
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=144&view=rev
Author: gerkey
Date: 2008-04-18 19:01:46 -0700 (Fri, 18 Apr 2008)
Log Message:
-----------
spruced up
Modified Paths:
--------------
pkg/trunk/gmapping/configure
Modified: pkg/trunk/gmapping/configure
===================================================================
--- pkg/trunk/gmapping/configure 2008-04-19 00:33:20 UTC (rev 143)
+++ pkg/trunk/gmapping/configure 2008-04-19 02:01:46 UTC (rev 144)
@@ -50,8 +50,11 @@
fi ;
done ;
if [ ! "$QT_INCLUDE" ]; then
- echo -e "\n\n*** Qt 3.x not found please set QT_INCLUDE, QT_LIB, MOC by hand\n\a"
+ echo -e "\n\n*** Qt 3.x not found. I'll make some educated guesses. If this doesn't work, please set QT_INCLUDE, QT_LIB, MOC by hand in the file global.mk.\n\a"
#exit 1
+ QT_INCLUDE="-I/usr/include/qt3";
+ QT_LIB="-lqt-mt" ;
+ MOC="moc" ;
else
echo "Ok" ;
fi
@@ -72,23 +75,23 @@
echo "Ok" ;
fi
-echo -n "Checking for Gsl libs "
-if [ "$OSTYPE" = "LINUX" ]; then
- GSL_LIB="-lgsl -lgslcblas"
- GSL_INCLUDE="-I/usr/include/"
-fi
-if [ "$OSTYPE" = "MACOSX" ]; then
- GSL_LIB="-L/sw/lib -lgsl -lgslcblas"
- GSL_INCLUDE="-I/sw/include"
-fi
+#echo -n "Checking for Gsl libs "
+#if [ "$OSTYPE" = "LINUX" ]; then
+# GSL_LIB="-lgsl -lgslcblas"
+# GSL_INCLUDE="-I/usr/include/"
+#fi
+#if [ "$OSTYPE" = "MACOSX" ]; then
+# GSL_LIB="-L/sw/lib -lgsl -lgslcblas"
+# GSL_INCLUDE="-I/sw/include"
+#fi
+#
+#if [ ! "$GSL_INCLUDE" ]; then
+# echo -e "\n\n*** GSL not found, please set GSL_INCLUDE and GSL_LIB by hand\n\a"
+#else
+# echo "Ok" ;
+#fi
-if [ ! "$GSL_INCLUDE" ]; then
- echo -e "\n\n*** GSL not found, please set GSL_INCLUDE and GSL_LIB by hand\n\a"
-else
- echo "Ok" ;
-fi
-
# echo -n "Checking for KDE 3.x includes ... "
# for GUESS_KDE_INCLUDE in /usr/include/kde /usr/include/kde3 /opt/kde3/include /opt/kde/include; do
# if [ -d $GUESS_KDE_INCLUDE ]; then
@@ -181,7 +184,19 @@
fi
fi
+PLAYERFLAG=""
+PLAYERSUPPORT="0"
+echo -n "Checking for player (pkg-config --libs playercore)..."
+playerlibs=`pkg-config --libs playercore`
+if [ -z "$playerlibs" ]; then
+ echo -e "Player not found."
+else
+ echo -e "Player found."
+ PLAYERFLAG="-DPLAYER_SUPPORT"
+ PLAYERSUPPORT="1"
+fi
+
CONFIG=global.mk
rm -f $CONFIG
@@ -226,15 +241,13 @@
# Flags
-CPPFLAGS+=$CPPFLAGS -I$MAPPING_ROOT $CARMENFLAG
+CPPFLAGS+=$CPPFLAGS -I$MAPPING_ROOT $CARMENFLAG $PLAYERFLAG
CXXFLAGS+=$CXXFLAGS
-LDFLAGS+=$LDFLAGS
+LDFLAGS+=$LDFLAGS -Xlinker -rpath $MAPPING_ROOT/lib
CARMENSUPPORT=$CARMENSUPPORT
+PLAYERSUPPORT=$PLAYERSUPPORT
ARIASUPPORT=$ARIASUPPORT
-GSL_LIB=$GSL_LIB
-GSL_INCLUDE=$GSL_INCLUDE
-
$OTHER
include $MAPPING_ROOT/manual.mk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
