Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 237572 | Differences between
and this patch

Collapse All | Expand All

(-)scilab-5.2.1.orig//configure.ac (-3 / +3 lines)
Lines 700-711 Link Here
700
				   LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
700
				   LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
701
				   AC_CHECK_LIB([jogl], [glTexParameterf], [JOGL_LIBS="-ljogl"],[AC_MSG_WARN([Could not link against -ljogl. Will try against -ljogl -lGL])])
701
				   AC_CHECK_LIB([jogl], [glTexParameterf], [JOGL_LIBS="-ljogl"],[AC_MSG_WARN([Could not link against -ljogl. Will try against -ljogl -lGL])])
702
				   if test -z "$JOGL_LIBS"; then # The previous test failed add more options to the LDFLAGS
702
				   if test -z "$JOGL_LIBS"; then # The previous test failed add more options to the LDFLAGS
703
				   	   LDFLAGS="$LDFLAGS -lGL "
703
				   	   LDFLAGS="$LDFLAGS"
704
					   # the space after "jogl" in the following line is on	
704
					   # the space after "jogl" in the following line is on	
705
					   # purpose to disable the cache
705
					   # purpose to disable the cache
706
				   	   AC_CHECK_LIB([jogl ], [glTexParameterf], 
706
				   	   AC_CHECK_LIB([jogl ], [glTexParameterf], 
707
					   [JOGL_LIBS="-ljogl -lGL"],
707
					   [JOGL_LIBS="-ljogl -lGL"],
708
					   [AC_MSG_ERROR(["libjogl: Library missing (Cannot find symbol glTexParameterf). Check if libjogl - C/Java (JNI) interface for JOGL - or libGL are installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries."])])
708
					   [AC_MSG_ERROR(["libjogl: Library missing (Cannot find symbol glTexParameterf). Check if libjogl - C/Java (JNI) interface for JOGL - or libGL are installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries."])],[-lGL])
709
				   fi
709
				   fi
710
710
711
				   LDFLAGS=$LDFLAGS_save
711
				   LDFLAGS=$LDFLAGS_save
Lines 724-730 Link Here
724
				   LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -ldl -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
724
				   LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -ldl -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
725
				   symbol="Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J"
725
				   symbol="Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J"
726
				   AC_CHECK_LIB([gluegen-rt], [$symbol], [GLUEGEN_RT_LIBS="-lgluegen-rt"],
726
				   AC_CHECK_LIB([gluegen-rt], [$symbol], [GLUEGEN_RT_LIBS="-lgluegen-rt"],
727
				   [AC_MSG_ERROR([libgluegen-rt: Library missing (Cannot find symbol glTexParameterf). Check if libgluegen-rt - C/Java (JNI) interface for GLUEGEN - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries.])])
727
				   [AC_MSG_ERROR([libgluegen-rt: Library missing (Cannot find symbol glTexParameterf). Check if libgluegen-rt - C/Java (JNI) interface for GLUEGEN - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries.])],[-ldl])
728
				   LDFLAGS=$LDFLAGS_save
728
				   LDFLAGS=$LDFLAGS_save
729
				fi
729
				fi
730
730

Return to bug 237572