Le ven 31/05/2002 =E0 06:40, Pavel Troller a =E9crit :
> > i think you must use $USER_INCLUDES and $USER_LIBS here
> > as:
> > CPPFLAGS=3D"$CPPFLAGS $USER_INCLUDES"
> > LDFLAGS=3D"$LDFLAGS $USER_LIBS"
> >=20
> Hi!
>   Yes, I'm so stupid... I saw this in the "official" ogg detection
> and I didn't remember it. Of course it works. I added $KDE_INCLUDES as we=
ll
> to make this check coherent with the remaining ones, which also search
> in this place.
>   Now configure found all the things in all the places :-).=20
>   Please could somebody commit my patch (together with the above change,
> I don't want to send another junk to the list) as a temporary fix, until
> somebody writes a real fix ?
>                                        With regards, Pavel Troller

Hi,

 here come the final patch with some misc compilation fixes.

 Can somebody review and commit this patch please? ;)


 Happy coding,
  FeniX


Index: arts/modules/synth_osc_impl.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdemultimedia/arts/modules/synth_osc_impl.cc,v
retrieving revision 1.1
diff -u -u -r1.1 synth_osc_impl.cc
--- arts/modules/synth_osc_impl.cc      18 May 2002 15:14:28 -0000    =20
1.1
+++ arts/modules/synth_osc_impl.cc      31 May 2002 17:50:07 -0000
@@ -128,7 +128,7 @@
                        freqs[n_freqs] =3D 20;
                        while (freqs[n_freqs] < 22000)
                        {
-                               freqs[n_freqs + 1] =3D freqs[n_freqs] *
sqrt(2);
+                               freqs[n_freqs + 1] =3D freqs[n_freqs] *
std::sqrt(2.0f);
                                n_freqs++;
                        }
                        arts_debug("Synth_OSC::waveForm: n_freqs =3D %d",
n_freqs);
Index: k3b/configure.in.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdemultimedia/k3b/configure.in.in,v
retrieving revision 1.21
diff -u -u -r1.21 configure.in.in
--- k3b/configure.in.in 28 May 2002 18:31:42 -0000      1.21
+++ k3b/configure.in.in 31 May 2002 17:50:08 -0000
@@ -1,11 +1,11 @@
 #MIN_CONFIG

-CCAS=3D$(CC)
-CCASFLAGS=3D$(CFLAGS)
+CCAS=3D${CC}
+CCASFLAGS=3D${CFLAGS}
 AC_SUBST(CCAS)
 AC_SUBST(CCASFLAGS)
-AS=3D$(CC)
-ASFLAGS=3D$(CFLAGS)
+AS=3D${CC}
+ASFLAGS=3D${CFLAGS}
 AC_SUBST(AS)
 AC_SUBST(ASFLAGS)

@@ -38,7 +38,7 @@

 if test "x$with_cdparanoia" =3D "xCHECK" ; then
   with_cdparanoia=3DNOTFOUND
-  search_incs=3D"$kde_includes /usr/include /usr/local/include
/usr/include/cdda /usr/local/include/cdda"
+  search_incs=3D"$kde_includes $kde_extra_includes /usr/include
/usr/local/include /usr/include/cdda /usr/local/include/cdda"
   AC_FIND_FILE(cdda_interface.h, $search_incs, para_incdir)
   if test -r $para_incdir/cdda_interface.h ; then
     test "x$para_incdir" !=3D "x/usr/include" &&
CDPARANOIA_INCS=3D"-I$para_incdir"
@@ -48,7 +48,7 @@
     with_cdparanoia=3DNOTFOUND
     # because of the horrible hack we need shared cdparanoia
     for ext in la so sl a ; do
-      AC_FIND_FILE(libcdda_paranoia.$ext, $kde_libraries /usr/lib
/usr/local/lib,
+      AC_FIND_FILE(libcdda_paranoia.$ext, $kde_libraries
$kde_extra_libs /usr/lib /usr/local/lib,
         para_libdir)
       if test -r $para_libdir/libcdda_paranoia.$ext ; then
         if test "x$para_libdir" !=3D "x/usr/lib" ; then
@@ -106,6 +106,8 @@

 OGG_VORBISLIBS=3D""
 AC_MSG_CHECKING(for ogg/vorbis headers)
+CPPFLAGS=3D"$CPPFLAGS $KDE_INCLUDES $USER_INCLUDES"
+LDFLAGS=3D"$LDFLAGS $KDE_LDFLAGS $USER_LDFLAGS"
 ogg_vorbis=3Dno
 AC_TRY_COMPILE([
                #include <vorbis/codec.h>
Index: kaudiocreator/cdconfigimp.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdemultimedia/kaudiocreator/cdconfigimp.cpp,v
retrieving revision 1.6
diff -u -u -r1.6 cdconfigimp.cpp
--- kaudiocreator/cdconfigimp.cpp       30 May 2002 11:46:14 -0000    =20
1.6
+++ kaudiocreator/cdconfigimp.cpp       31 May 2002 17:50:08 -0000
@@ -74,7 +74,7 @@
 #include "cdconfigimp.h"
 #include "cddb.h"

-using namespace KIO;
+//using namespace KIO;

 #define MAX_IPC_SIZE (1024*32)

Index: kioslave/audiocd/configure.in.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdemultimedia/kioslave/audiocd/configure.in.in,v
retrieving revision 1.22
diff -u -u -r1.22 configure.in.in
--- kioslave/audiocd/configure.in.in    24 May 2002 22:49:02 -0000    =20
1.22
+++ kioslave/audiocd/configure.in.in    31 May 2002 17:50:09 -0000
@@ -16,7 +16,7 @@

 if test "x$with_cdparanoia" =3D "xCHECK" ; then
   with_cdparanoia=3DNOTFOUND
-  search_incs=3D"$kde_includes /usr/include /usr/local/include
/usr/include/cdda /usr/local/include/cdda"
+  search_incs=3D"$kde_includes $kde_extra_includes /usr/include
/usr/local/include /usr/include/cdda /usr/local/include/cdda"
   AC_FIND_FILE(cdda_interface.h, $search_incs, para_incdir)
   if test -r $para_incdir/cdda_interface.h ; then
     test "x$para_incdir" !=3D "x/usr/include" &&
CDPARANOIA_INCS=3D"-I$para_incdir"
@@ -26,7 +26,7 @@
     with_cdparanoia=3DNOTFOUND
     # because of the horrible hack we need shared cdparanoia
     for ext in la so sl a ; do
-      AC_FIND_FILE(libcdda_paranoia.$ext, $kde_libraries /usr/lib
/usr/local/lib,
+      AC_FIND_FILE(libcdda_paranoia.$ext, $kde_libraries
$kde_extra_libs /usr/lib /usr/local/lib,
         para_libdir)
       if test -r $para_libdir/libcdda_paranoia.$ext ; then
         if test "x$para_libdir" !=3D "x/usr/lib" ; then
@@ -98,7 +98,7 @@

 if test "x$with_lame" =3D "xCHECK" ; then
   with_lame=3DNOTFOUND
-  search_incs=3D"/usr/local/include $kde_includes /usr/include"
+  search_incs=3D"/usr/local/include $kde_includes $kde_extra_includes
/usr/include"
   AC_FIND_FILE(lame/lame.h, $search_incs, lame_incdir)
   if test -r $lame_incdir/lame/lame.h ; then
     test "x$lame_incdir" !=3D "x/usr/include" &&
LAME_INCS=3D"-I$lame_incdir"
@@ -107,7 +107,7 @@
   if test $with_lame =3D FOUND ; then
     with_lame=3DNOTFOUND
     for ext in la so sl a ; do
-      AC_FIND_FILE(libmp3lame.$ext, /usr/local/lib $kde_libraries
/usr/lib,
+      AC_FIND_FILE(libmp3lame.$ext, /usr/local/lib $kde_libraries
$kde_extra_libs /usr/lib,
         lame_libdir)
       if test -r $lame_libdir/libmp3lame.$ext ; then
         if test "x$lame_libdir" !=3D "x/usr/lib" ; then
@@ -246,7 +246,7 @@
 have_vorbis_value=3D1
 if test "x$with_vorbis" =3D "xCHECK" ; then
   with_vorbis=3DNOTFOUND
-  search_incs=3D"$kde_includes /usr/local/include /usr/include"
+  search_incs=3D"$kde_includes $kde_extra_includes /usr/local/include
/usr/include"
   AC_FIND_FILE(vorbis/codec.h, $search_incs, vorbis_incdir)
   if test -r $vorbis_incdir/vorbis/codec.h ; then
     test "x$vorbis_incdir" !=3D "x/usr/include" &&
VORBIS_INCS=3D"-I$vorbis_incdir"
@@ -257,7 +257,7 @@
   if test $with_vorbis =3D FOUND ; then
     with_vorbis=3DNOTFOUND
     for ext in la so sl a ; do
-      AC_FIND_FILE(libvorbis.$ext, $kde_libraries /usr/local/lib
/usr/lib,
+      AC_FIND_FILE(libvorbis.$ext, $kde_libraries $kde_extra_libs
/usr/local/lib /usr/lib,
         vorbis_libdir)
       if test -r $vorbis_libdir/libvorbis.$ext ; then
         if test "x$vorbis_libdir" !=3D "x/usr/lib" ; then
Index: kmidi/alsa_a.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/kde/kdemultimedia/kmidi/alsa_a.cpp,v
retrieving revision 1.8
diff -u -u -r1.8 alsa_a.cpp
--- kmidi/alsa_a.cpp    24 Aug 2000 18:49:04 -0000      1.8
+++ kmidi/alsa_a.cpp    31 May 2002 17:50:09 -0000
@@ -254,7 +254,7 @@
                =3D=3D 1 warning
                =3D=3D -1 fails
  */
-static int set_playback_info (void* handle__,
+static int set_playback_info (snd_pcm_t*  handle__,
                              uint32* encoding__, uint32* rate__,
                              const int32 extra_param[5])
 {


 
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<