El día Monday, March 31, 2008 a las 07:33:28PM +0200, Damien Sandras escribió:
> Hi Matthias,
>
> I have committed the parts of the patch I thought relevant.
>
> I did not commit :
> * the patch done on configure instead of configure.ac
Hi Damien,
Here comes the patch for the two configure.ac and for some Makefile.in
stuff;
matthias
--
Matthias Apitz
Manager Technical Support - OCLC GmbH
Gruenwalder Weg 28g - 82041 Oberhaching - Germany
t +49-89-61308 351 - f +49-89-61308 399 - m +49-170-4527211
e <[EMAIL PROTECTED]> - w http://www.oclc.org/ http://www.UnixArea.de/
b http://gurucubano.blogspot.com/
Don't top-post, read RFC1855 http://www.faqs.org/rfcs/rfc1855.html
A: Because it messes up the order in which people normally read text.
Q: Why is it such a bad thing?
A: Top-posting.
Q: What is the most annoying thing on Usenet and in e-mail?
*** opal/configure.ac.orig 2008-03-31 15:19:11.000000000 +0200
--- opal/configure.ac 2008-03-31 15:35:42.000000000 +0200
***************
*** 267,273 ****
printf("%s\n", header.speex_version);
}
C_FILE
! cc -o t t.c -lspeex > /dev/null 2>&1
if test \! -x t ; then
AC_MSG_RESULT(cannot determine - using OPAL version)
else
--- 267,273 ----
printf("%s\n", header.speex_version);
}
C_FILE
! cc -o t t.c $LDFLAGS -lspeex > /dev/null 2>&1
if test \! -x t ; then
AC_MSG_RESULT(cannot determine - using OPAL version)
else
***************
*** 373,379 ****
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
! AC_CHECK_LIB([dl],[dlopen],[HAS_LIBDL=1], [HAS_LIBDL=0])
fi
fi
AC_SUBST(HAS_LIBDL)
--- 373,383 ----
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
! if test `uname -s` = FreeBSD; then
! AC_CHECK_LIB([c],[dlopen],[HAS_LIBDL=1], [HAS_LIBDL=0])
! else
! AC_CHECK_LIB([dl],[dlopen],[HAS_LIBDL=1], [HAS_LIBDL=0])
! fi
fi
fi
AC_SUBST(HAS_LIBDL)
*** opal/plugins/configure.ac.orig 2008-03-31 15:20:16.000000000 +0200
--- opal/plugins/configure.ac 2008-04-01 16:12:12.000000000 +0200
***************
*** 151,157 ****
printf("%s\n", header.speex_version);
}
C_FILE
! cc -o t t.c -lspeex > /dev/null 2>&1
if test \! -x t ; then
AC_MSG_RESULT(cannot determine - using library version)
else
--- 151,157 ----
printf("%s\n", header.speex_version);
}
C_FILE
! cc -o t t.c $LDFLAGS -lspeex > /dev/null 2>&1
if test \! -x t ; then
AC_MSG_RESULT(cannot determine - using library version)
else
***************
*** 303,309 ****
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
! AC_CHECK_LIB([dl],[dlopen],[HAS_LIBDL=1], [HAS_LIBDL=0])
fi
fi
AC_SUBST(HAS_LIBDL)
--- 303,313 ----
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
! if test `uname -s` = FreeBSD; then
! AC_CHECK_LIB([c],[dlopen],[HAS_LIBDL=1], [HAS_LIBDL=0])
! else
! AC_CHECK_LIB([dl],[dlopen],[HAS_LIBDL=1], [HAS_LIBDL=0])
! fi
fi
fi
AC_SUBST(HAS_LIBDL)
***************
*** 445,451 ****
AC_CHECK_HEADERS([x264.h], [x264_headers=true], [x264_headers=false])
if test "x${x264_headers}" = "xtrue"; then
if test "x$HAS_LIBDL" != "x0" ; then
! X264_LIBS="-ldl"
fi
AC_MSG_CHECKING(for x264 version >= 48)
--- 449,459 ----
AC_CHECK_HEADERS([x264.h], [x264_headers=true], [x264_headers=false])
if test "x${x264_headers}" = "xtrue"; then
if test "x$HAS_LIBDL" != "x0" ; then
! if test `uname -s` = FreeBSD; then
! X264_LIBS="-lc"
! else
! X264_LIBS="-ldl"
! fi
fi
AC_MSG_CHECKING(for x264 version >= 48)
*** opal/plugins/audio/GSM0610/Makefile.in 2008-04-01 14:27:31.000000000 +0200
--- opal/plugins/audio/GSM0610/Makefile.in.orig 2008-04-01 14:27:08.000000000 +0200
***************
*** 146,152 ****
else
$(PLUGIN): $(OBJECTS)
! $(CC) $(LDSO) -o $@ $^ $(LDFLAGS) $(EXTRALIBS)
endif
install:
--- 146,152 ----
else
$(PLUGIN): $(OBJECTS)
! $(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)
endif
install:
*** opal/plugins/video/H.263-ffmpeg/Makefile.in 2008-03-26 08:14:48.000000000 +0100
--- opal/plugins/video/H.263-ffmpeg/Makefile.in.orig 2008-03-26 08:14:27.000000000 +0100
***************
*** 63,69 ****
OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
$(PLUGIN): $(OBJECTS)
! $(CXX) $(LDSO) $(LDFLAGS) -o $@ $^
install:
mkdir -p $(DESTDIR)$(LIBDIR)/ptlib/codecs/video/
--- 63,69 ----
OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
$(PLUGIN): $(OBJECTS)
! $(CXX) $(LDSO) -o $@ $^
install:
mkdir -p $(DESTDIR)$(LIBDIR)/ptlib/codecs/video/
_______________________________________________
Ekiga-devel-list mailing list
Ekiga-devel-list@gnome.org
http://mail.gnome.org/mailman/listinfo/ekiga-devel-list
