File ARToolKit-2.72.1-configure.patch of Package ARToolKit_gst

Overview Repositories Revisions Requests Users Attributes Meta

File ARToolKit-2.72.1-configure.patch of Package ARToolKit_gst

diff -rupN ARToolKit/Configure ARToolKit_mod/Configure
--- ARToolKit/Configure	2006-12-06 01:37:23.000000000 +0100
+++ ARToolKit_mod/Configure	2010-05-15 21:30:36.350017222 +0200
@@ -55,11 +55,11 @@ then
 			exit 0
 		fi	
         VIDEO_DRIVER="VideoLinuxV4L"
-        CFLAG="-O -I/usr/X11R6/include"
-        LDFLAG="-L/usr/X11R6/lib"
+        CFLAG="$RPM_OPT_FLAGS"
+        LDFLAG=""
         ARFLAG="rs"
         RANLIB=""
-        LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm"
+        LIBS="-lglut `pkg-config glu x11 xi xmu --libs`"
         CONFIG="AR_INPUT_V4L"
     elif [ "$ANS" = "2" ]
     then
@@ -78,11 +78,11 @@ then
 			exit 0
 		fi		
         VIDEO_DRIVER="VideoLinuxV4L"
-        CFLAG="-O -I/usr/X11R6/include -DUSE_EYETOY"
-        LDFLAG="-L/usr/X11R6/lib"
+        CFLAG="$RPM_OPT_FLAGS -DUSE_EYETOY"
+        LDFLAG=""
         ARFLAG="rs"
         RANLIB=""
-        LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm -ljpeg"
+        LIBS="-lglut `pkg-config glu x11 xi xmu --libs` -ljpeg"
         CONFIG="AR_INPUT_V4L"
     elif [ "$ANS" = "3" ]
     then
@@ -91,7 +91,7 @@ then
         LDFLAG="-L/usr/X11R6/lib -L/usr/local/lib"
         ARFLAG="rs"
         RANLIB=""
-        LIBS="-lraw1394 -ldv -lpthread -lglut -lGLU -lGL -lXi -lXmu -lX11 -lm"
+        LIBS="-lraw1394 -ldv -lpthread -lglut `pkg-config glu x11 xi xmu --libs`"
         CONFIG="AR_INPUT_DV"
     elif [ "$ANS" = "4" ]
     then
@@ -100,19 +100,16 @@ then
         LDFLAG="-L/usr/X11R6/lib"
         ARFLAG="rs"
         RANLIB=""
-        LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm -lraw1394 -ldc1394_control"
+        LIBS="-lglut `pkg-config glu x11 xi xmu --libs` -lraw1394 -ldc1394_control"
         CONFIG="AR_INPUT_1394CAM"
     elif [ "$ANS" = "5" ]
     then
         VIDEO_DRIVER="VideoGStreamer"
-		GST_INCLUDE=`pkg-config --cflags gstreamer-0.10`
-		GST_LIBS=`pkg-config --libs gstreamer-0.10`
-		
-		CFLAG="-O $GST_INCLUDE -I/usr/X11R6/include"
-        LDFLAG="$GST_LIBS -L/usr/X11R6/lib -L/usr/local/lib"
+        CFLAG="$RPM_OPT_FLAGS `pkg-config --cflags gstreamer-0.10`"
+        LDFLAG=""
         ARFLAG="rs"
         RANLIB=""
-        LIBS="-lpthread -lglut -lGLU -lGL -lXi -lX11 -lm"
+        LIBS="-lglut `pkg-config gstreamer-0.10 glu x11 xi xmu --libs`"
         CONFIG="AR_INPUT_GSTREAMER"
     else
         echo "Please enter 1,2,3,4 or 5."

Places

File ARToolKit-2.72.1-configure.patch of Package ARToolKit_gst

Places