Hello, As introduction, I am an MPlayer developer and interested in helping out a little bit in case you have some small things to do. Anyway here are two patches to make ogmsim compiler out of the box on my system. The first one allows for auto* 2.6, which seems to work fine. The second uses kde-config to detect another possible KDE path (needed here because on gentoo the prefix /usr/kde/3.5 - I did not test how badly this fails if kde-config does not exist but it should at least not break cases that worked out of the box before).
Greetings, Reimar Döffinger
Index: ogsim/admin/cvs.sh
===================================================================
--- ogsim/admin/cvs.sh (revision 180)
+++ ogsim/admin/cvs.sh (working copy)
@@ -29,30 +29,30 @@
{
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
- Autoconf*2.5* | autoconf*2.5* ) : ;;
+ Autoconf*2.5* | autoconf*2.5* | Autoconf*2.6* | autoconf*2.6* ) : ;;
"" )
echo "*** AUTOCONF NOT FOUND!."
- echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
+ echo "*** KDE requires autoconf 2.5x or 2.6x"
exit 1
;;
* )
echo "*** YOU'RE USING $AUTOCONF_VERSION."
- echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
+ echo "*** KDE requires autoconf 2.5x or 2.6x"
exit 1
;;
esac
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
- Autoconf*2.5* | autoheader*2.5* ) : ;;
+ Autoconf*2.5* | autoheader*2.5* | Autoconf*2.6* | autoheader*2.6* ) : ;;
"" )
echo "*** AUTOHEADER NOT FOUND!."
- echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
+ echo "*** KDE requires autoheader 2.5x or 2.6x (part of autoconf)"
exit 1
;;
* )
echo "*** YOU'RE USING $AUTOHEADER_VERSION."
- echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
+ echo "*** KDE requires autoheader 2.5x or 2.6x (part of autoconf)"
exit 1
;;
esac
Index: ogsim/admin/acinclude.m4.in
===================================================================
--- ogsim/admin/acinclude.m4.in (revision 180)
+++ ogsim/admin/acinclude.m4.in (working copy)
@@ -542,7 +542,7 @@
)
AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin
/usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin
/usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin
`kde-config --prefix`/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin
$kde_default_bindirs"
if test -n "$KDEDIRS"; then
kde_save_IFS=$IFS
@@ -578,7 +578,7 @@
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin
/usr/local/bin /opt/local/bin], [XMLLINT=""])
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share
/opt/kde3/share /opt/kde/share $prefix/share"
+ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share
/opt/kde3/share /opt/kde/share $prefix/share `kde-config --prefix`/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl,
$kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -1738,7 +1738,7 @@
if test -z "$1"; then
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include
/usr/kde/include /usr/include/kde /usr/include /opt/kde3/include
/opt/kde/include $x_includes $qt_includes"
+kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include
/usr/kde/include /usr/include/kde /usr/include /opt/kde3/include
/opt/kde/include $x_includes $qt_includes `kde-config --prefix`/include"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR
$kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1750,7 +1750,7 @@
So, check this please and use another prefix!])
fi
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff}
/usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3
/usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff}
/opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff}
/usr/X11R6/kde/lib${kdelibsuff}"
+kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff}
/usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3
/usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff}
/opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff}
/usr/X11R6/kde/lib${kdelibsuff} `kde-config --prefix`/lib${kdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR
$kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
pgpDCvcasfE5n.pgp
Description: PGP signature
_______________________________________________ Open-graphics mailing list [email protected] http://lists.duskglow.com/mailman/listinfo/open-graphics List service provided by Duskglow Consulting, LLC (www.duskglow.com)
