diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac index 69f2bcf1ff60155866443a426b88423595a9df18..c2c254719cb06d53f067a5a5eb7cab6390efc216 100644 --- a/sflphone-common/configure.ac +++ b/sflphone-common/configure.ac @@ -67,9 +67,6 @@ AC_CONFIG_FILES([man/Makefile]) AC_CONFIG_FILES([doc/Makefile \ doc/doxygen/Makefile]) -AC_CONFIG_FILES([platform/suse.spec \ - platform/fedora.spec]) - dnl the file stamp-h.in should be there before (instead of AC_CONFIG_HEADERS(config.h)) dnl AM_CONFIG_HEADER(config.h) diff --git a/sflphone-common/debian/rules b/sflphone-common/debian/rules index b7d4afadca94757485c14a671f85c935da125f5f..86794e0774b687dea13b6ecc4f0ff51cc96f93a4 100755 --- a/sflphone-common/debian/rules +++ b/sflphone-common/debian/rules @@ -21,7 +21,7 @@ configure-stamp: dh_testdir # Add here commands to configure the package. ./autogen.sh --prefix=/usr - cd libs/pjproject-1.0.1; ./autogen.sh + cd libs/pjproject-1.0.1; ./autogen.sh --prefix=/usr touch configure-stamp #Architecture @@ -31,8 +31,8 @@ build-arch: build-arch-stamp build-arch-stamp: configure-stamp # Add here commands to compile the arch part of the package. - $(MAKE) - cd libs/pjproject-1.0.1; $(MAKE) dep; $(MAKE) + cd libs/pjproject-1.0.1; $(MAKE) dep; $(MAKE) clean; $(MAKE) + cd -; $(MAKE) touch $@ build-indep: build-indep-stamp diff --git a/sflphone-common/libs/pjproject-1.0.1/autogen.sh b/sflphone-common/libs/pjproject-1.0.1/autogen.sh index 51e6d2e71d348bd5561c9f4cd7a6f7b4ab37adba..1aad191a1e6b560a8d6f8ee16969ce8a6f5799db 100755 --- a/sflphone-common/libs/pjproject-1.0.1/autogen.sh +++ b/sflphone-common/libs/pjproject-1.0.1/autogen.sh @@ -7,14 +7,17 @@ # Author: Julien Bonjean (julien@bonjean.info) # # Creation Date: 2009-05-26 -# Last Modified: 2009-05-26 11:55:12 -0400 +# Last Modified: 2009-05-27 11:00:20 -0400 ##################################################### -# it's only a workaround to generate config.guess and config.sub -# that are currently static -# this will generate errors but we don't care -aclocal --force >/dev/null 2>&1 -automake --add-missing --force-missing --copy >/dev/null 2>&1 +if [ -e /usr/share/misc/config.guess ]; then + rm -f config.sub config.guess + ln -s /usr/share/misc/config.sub . + ln -s /usr/share/misc/config.guess . +else + aclocal --force + automake --add-missing --force-missing --copy +fi # now we launch configure ./configure $@ diff --git a/sflphone-common/libs/pjproject-1.0.1/configure.ac b/sflphone-common/libs/pjproject-1.0.1/configure.ac index 9d8fb5d5f47e44b459139e2ce62947045d4be841..bf1644033a4f5cb86b7e9dc8e49804bfa092ee58 100644 --- a/sflphone-common/libs/pjproject-1.0.1/configure.ac +++ b/sflphone-common/libs/pjproject-1.0.1/configure.ac @@ -3,4 +3,3 @@ dnl Dummy configure.ac for autotools AC_INIT LT_INIT AC_OUTPUT -END