[Pkg-ace-commits] [pkg-ace] r599 - in trunk/debian: . patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-04-23 19:19:51 +0000 (Wed, 23 Apr 2008)
New Revision: 599

Modified:
   trunk/debian/changelog
   trunk/debian/patches/05-autoconf-fox.dpatch
   trunk/debian/rules
Log:
rework patch 05 again. This should fix FTBFS on many arches.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-23 17:17:23 UTC (rev 598)
+++ trunk/debian/changelog	2008-04-23 19:19:51 UTC (rev 599)
@@ -1,3 +1,10 @@
+ace (5.6.3-3) unstable; urgency=low
+
+  * Pass full path to fox-config-1.6 instead of trying to detect fox-config
+    since fox-config is an alternative. Should fix multiple FTBFS.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Wed, 23 Apr 2008 18:36:57 +0000
+
 ace (5.6.3-2) unstable; urgency=low
 
   * Add missing libfox-1.6-dev build dependency. Thanks to Bastian Blank for

Modified: trunk/debian/patches/05-autoconf-fox.dpatch
===================================================================
--- trunk/debian/patches/05-autoconf-fox.dpatch	2008-04-23 17:17:23 UTC (rev 598)
+++ trunk/debian/patches/05-autoconf-fox.dpatch	2008-04-23 19:19:51 UTC (rev 599)
@@ -23,15 +23,15 @@
 +#---------------------------------------------------------------------------
 +AC_DEFUN([ACE_PATH_FOX],
 +[AC_ARG_WITH([fox-config],
-+ AS_HELP_STRING([--with-fox-config=DIR],
++ AS_HELP_STRING([--with-fox-config=PATH],
 +                [path to fox-config [[automatic]]]),
-+ [ ac_fox_config_dir="${withval}" ])
-+ if test X"${ac_fox_config_dir}" = X; then
++ [ ac_fox_config="${withval}" ])
++ if test X"${ac_fox_config}" = X; then
 +   AC_PATH_PROG([FOXCONFIG], [fox-config], [], [])
 + else
-+  AC_MSG_CHECKING([whether fox-config exists in ${ac_fox_config_dir}])
-+   if test -f "${ac_fox_config_dir}/fox-config"; then
-+     FOXCONFIG="${ac_fox_config_dir}/fox-config"
++  AC_MSG_CHECKING([whether ${ac_fox_config} exists])
++   if test -f "${ac_fox_config}"; then
++     FOXCONFIG="${ac_fox_config}"
 +     AC_MSG_RESULT([yes])
 +   else
 +     AC_MSG_RESULT([no])

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-04-23 17:17:23 UTC (rev 598)
+++ trunk/debian/rules	2008-04-23 19:19:51 UTC (rev 599)
@@ -263,7 +263,8 @@
            --disable-tao-examples --disable-tao-tests \
            --disable-ace-examples --disable-ace-tests \
            --enable-fl-reactor --enable-qt-reactor --enable-xt-reactor \
-           --enable-tk-reactor --enable-fox-reactor \
+           --enable-tk-reactor \
+           --with-fox-config=/usr/bin/fox-config-1.6 --enable-fox-reactor \
            --with-tclconfig=$(TCL_HOME) --with-tkconfig=$(TK_HOME) \
            --with-zlib --with-zzip \
            --enable-inline \