Package: iaxcomm
Version: 0.0+cvs20051123-0.1
Severity: wishlist
Tags: patch
Here is a patch to build iaxcomm against wxWidgets 2.6.
The patch attached is a diff between the current debian directory and my
modified version, other little things has changed, below the changelog:
* Clean up Build-dep to compile with wxWidgets 2.6
* Commented some old patches in debian/patches/00list (40_fixes,
160_umask, 170_deadlock, 90_mixer, 210_ringback)
* Added a new patch to include a needed header file in audio_encode.c
(see 46_audio_encode_include_speex_prepocess.dpatch)
* Fixed the debian/rules file to be able to use SPEEX_ECHO.
* Hacked the configure script to use pkg-config instead of
gtk-config, so we can now build win wxWidgets 2.6 that uses
libgtk2.0
* Fixed the debian/rules to build iaxcomm with wx 2.6
Note:
I used wxString::FromAscii() in two places, but I am not sure if it is
the right approach to convert a const char[] to a wxString (the
wxString contructor does not accept a const char[] AFAICS).
Thanks for your packages.
Best regards,
Antonio Ospite.
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.14.2-ao
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Versions of packages iaxcomm depends on:
ii libatk1.0-0 1.10.3-1 The ATK accessibility toolkit
ii libc6 2.3.5-8.1 GNU C Library: Shared libraries an
ii libgcc1 1:4.0.2-5 GCC support library
ii libglib2.0-0 2.8.4-2 The GLib library of C routines
ii libgsm1 1.0.10-13 Shared libraries for GSM speech co
ii libgtk2.0-0 2.6.10-2 The GTK+ graphical user interface
ii libpango1.0-0 1.8.2-3 Layout and rendering of internatio
ii libportaudio0 18.1-4 Portable audio I/O - shared librar
ii libspeex1 1.1.11-1 The Speex Speech Codec
ii libstdc++6 4.0.2-5 The GNU Standard C++ Library v3
ii libwxgtk2.6-0 2.6.1.2 wxWidgets Cross-platform C++ GUI t
iaxcomm recommends no packages.
-- no debconf information
diff -ruNad iaxclient-0.0+cvs20050725/debian/changelog
iaxclient-0.0+cvs20051124/debian/changelog
--- iaxclient-0.0+cvs20050725/debian/changelog 2005-11-23 21:45:36.000000000
+0100
+++ iaxclient-0.0+cvs20051124/debian/changelog 2005-11-24 13:37:02.000000000
+0100
@@ -1,3 +1,18 @@
+iaxclient (0.0+cvs20051123-0.1) unstable; urgency=low
+
+ * Build code from CVS.
+ * Clean up Build-dep to compile with wxWidgets 2.6
+ * Commented some old patches in debian/patches/00list (40_fixes, 160_umask,
+ 170_deadlock, 90_mixer, 210_ringback)
+ * Added a new patch to include a needed header file in audio_encode.c
+ (see 46_audio_encode_include_speex_prepocess.dpatch)
+ * Fixed the debian/rules file to be able to use SPEEX_ECHO.
+ * Hacked the configure script to use pkg-config instead of gtk-config, so we
+ can now build win wxWidgets 2.6 that uses libgtk2.0
+ * Fixed the debian/rules to build iaxcomm with wx 2.6
+
+ -- Antonio Ospite <[EMAIL PROTECTED]> Thu, 24 Nov 2005 13:22:16 +0100
+
iaxclient (0.0+cvs20050725-5) unstable; urgency=low
[ Mikael Magnusson ]
diff -ruNad iaxclient-0.0+cvs20050725/debian/control
iaxclient-0.0+cvs20051124/debian/control
--- iaxclient-0.0+cvs20050725/debian/control 2005-11-23 21:45:36.000000000
+0100
+++ iaxclient-0.0+cvs20051124/debian/control 2005-11-24 13:37:02.000000000
+0100
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian VoIP Team <[EMAIL PROTECTED]>
Uploaders: Mark Purcell <[EMAIL PROTECTED]>, Mikael Magnusson <[EMAIL
PROTECTED]>, Kilian Krause <[EMAIL PROTECTED]>, Jose Carlos Garcia Sogo <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), dpatch, autotools-dev, libgsm1-dev,
libspeex-dev (>= 1.1.10-1), libportaudio-dev, libwxgtk2.4-dev, libgtk1.2-dev,
libwxgtk2.4-contrib-dev (>= 2.4.2.5)
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.0.0), dpatch, autotools-dev, libgsm1-dev,
libspeex-dev (>= 1.1.10-1), libportaudio-dev, libwxgtk2.6-dev, libgtk2.0-dev
+Standards-Version: 3.6.2
Package: libiaxclient-dev
Section: devel
diff -ruNad iaxclient-0.0+cvs20050725/debian/patches/00list
iaxclient-0.0+cvs20051124/debian/patches/00list
--- iaxclient-0.0+cvs20050725/debian/patches/00list 2005-11-23
21:45:36.000000000 +0100
+++ iaxclient-0.0+cvs20051124/debian/patches/00list 2005-11-24
13:37:02.000000000 +0100
@@ -3,16 +3,17 @@
14_autoconf_chmod
13_config
#20_lib
-40_fixes
+#40_fixes
+46_audio_encode_include_speex_prepocess
50_wish
80_jiaxc
110_xrcdirectory
#120_separate_streams
150_iax2_newjb
-160_umask
-170_deadlock
+#160_umask
+#170_deadlock
180_filter
-90_mixer
+#90_mixer
200_version
-210_ringback
+#210_ringback
220_audio_encode
diff -ruNad iaxclient-0.0+cvs20050725/debian/patches/110_xrcdirectory.dpatch
iaxclient-0.0+cvs20051124/debian/patches/110_xrcdirectory.dpatch
--- iaxclient-0.0+cvs20050725/debian/patches/110_xrcdirectory.dpatch
2005-11-23 21:45:36.000000000 +0100
+++ iaxclient-0.0+cvs20051124/debian/patches/110_xrcdirectory.dpatch
2005-11-24 13:37:02.000000000 +0100
@@ -4,68 +4,77 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Search for resources in directory specified by XRCDIRECTORY macro.
## DP: Don't call InitXmlResource unless HAVE_INITXMLRESOURCE is defined.
-## DP: Call wxFatalError if the resources can't be loaded.
+## DP: Call wxLogError if the resources can't be loaded.
@DPATCH@
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/accounts.cc
/tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/accounts.cc
---- iaxclient-20050503/simpleclient/iaxcomm/accounts.cc 2005-04-13
12:28:06.000000000 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/accounts.cc
2005-05-10 22:29:33.048910062 +0200
+diff -urNad iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/accounts.cc
iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/accounts.cc
+--- iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/accounts.cc
2005-11-24 13:20:25.000000000 +0100
++++ iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/accounts.cc 2005-11-24
13:20:36.000000000 +0100
@@ -63,7 +63,9 @@
AccountsDialog::AccountsDialog( wxWindow* parent )
{
- wxXmlResource::Get()->LoadDialog(this, parent, wxT("Accounts"));
+ if ( !wxXmlResource::Get()->LoadDialog(this, parent, wxT("Accounts")) ) {
-+ wxFatalError(_("Can't load Accounts dialog"));
++ wxLogError(_("Can't load Accounts dialog"));
+ }
//----Reach in for our
controls-----------------------------------------------------
AccountList = XRCCTRL(*this, "AccountList", wxListCtrl);
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/devices.cc
/tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/devices.cc
---- iaxclient-20050503/simpleclient/iaxcomm/devices.cc 2005-04-13
12:28:06.000000000 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/devices.cc
2005-05-10 22:29:33.049909831 +0200
+diff -urNad iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/devices.cc
iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/devices.cc
+--- iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/devices.cc 2005-11-24
13:20:25.000000000 +0100
++++ iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/devices.cc 2005-11-24
13:20:36.000000000 +0100
@@ -66,7 +66,9 @@
DevicesDialog::DevicesDialog(wxWindow* parent)
{
- wxXmlResource::Get()->LoadDialog(this, parent, wxT("Devices"));
+ if ( !wxXmlResource::Get()->LoadDialog(this, parent, wxT("Devices")) ) {
-+ wxFatalError(_("Can't load Devices dialog"));
++ wxLogError(_("Can't load Devices dialog"));
+ }
// Reach in for our controls
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/directory.cc
/tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/directory.cc
---- iaxclient-20050503/simpleclient/iaxcomm/directory.cc 2005-04-13
12:28:06.000000000 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/directory.cc
2005-05-10 22:29:33.028914674 +0200
+diff -urNad iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/directory.cc
iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/directory.cc
+--- iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/directory.cc
2005-11-24 13:20:25.000000000 +0100
++++ iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/directory.cc
2005-11-24 13:20:36.000000000 +0100
@@ -72,7 +72,9 @@
DirectoryDialog::DirectoryDialog( wxWindow* parent )
{
- wxXmlResource::Get()->LoadDialog(this, parent, wxT("Directory"));
+ if ( !wxXmlResource::Get()->LoadDialog(this, parent, wxT("Directory")) ) {
-+ wxFatalError(_("Can't load Directory dialog"));
++ wxLogError(_("Can't load Directory dialog"));
+ }
//----Reach in for our
controls-----------------------------------------------------
DirectoryNotebook = XRCCTRL(*this, "DirectoryNotebook", wxNotebook);
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/frame.cc
/tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/frame.cc
---- iaxclient-20050503/simpleclient/iaxcomm/frame.cc 2005-05-10
22:29:11.578861901 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/frame.cc
2005-05-10 22:29:33.029914444 +0200
-@@ -142,7 +142,9 @@
+diff -urNad iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/frame.cc
iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/frame.cc
+--- iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/frame.cc 2005-11-24
13:20:25.000000000 +0100
++++ iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/frame.cc 2005-11-24
13:21:06.000000000 +0100
+@@ -138,7 +138,9 @@
// However, the current approach has source code that can be recycled
// in case code to moves to having an invisible frame as the top level
window.
- wxXmlResource::Get()->LoadFrame(this, parent, _T("MyFrame"));
+ if ( !wxXmlResource::Get()->LoadFrame(this, parent, _T("MyFrame")) ) {
-+ wxFatalError(_("Can't load MyFrame frame"));
++ wxLogError(_("Can't load MyFrame frame"));
+ }
//----Set the
icon------------------------------------------------------------------
#ifdef __WXMSW__
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/main.cc
/tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/main.cc
---- iaxclient-20050503/simpleclient/iaxcomm/main.cc 2005-04-13
12:28:11.000000000 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/main.cc
2005-05-10 22:29:33.050909601 +0200
+@@ -244,7 +246,7 @@
+ #endif
+
+ #ifdef DATADIR
+- filename = wxFileName(wxString(DATADIR) + wxFILE_SEP_PATH +
++ filename = wxFileName(wxString::FromAscii(DATADIR) + wxFILE_SEP_PATH +
+ _T("iaxcomm.htb"));
+
+ if (filename.FileExists()) {
+diff -urNad iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/main.cc
iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/main.cc
+--- iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/main.cc 2005-11-24
13:20:25.000000000 +0100
++++ iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/main.cc 2005-11-24
13:20:36.000000000 +0100
@@ -60,6 +60,13 @@
int doTestCall(int ac, char **av);
}
@@ -96,13 +105,13 @@
InitXmlResource();
IncomingRing.Init( 880, 960, 16000, 48000, 10);
-@@ -332,6 +339,15 @@
+@@ -329,6 +336,15 @@
}
}
+ // Next, check XRCDIRECTORY
+#ifdef XRCDIRECTORY
-+ xrc_fullname = wxString(XRCDIRECTORY) + wxFILE_SEP_PATH + xrc_filename;
++ xrc_fullname = wxString::FromAscii(XRCDIRECTORY) + wxFILE_SEP_PATH +
xrc_filename;
+ if ( ::wxFileExists( xrc_fullname ) ) {
+ wxXmlResource::Get()->Load( xrc_fullname );
+ return;
@@ -112,16 +121,16 @@
// Third, check in cwd
xrc_fullname = wxGetCwd() + wxFILE_SEP_PATH + _T("rc") + wxFILE_SEP_PATH
+ xrc_filename;
if ( ::wxFileExists( xrc_fullname ) ) {
-diff -urNad iaxclient-20050503/simpleclient/iaxcomm/prefs.cc
/tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/prefs.cc
---- iaxclient-20050503/simpleclient/iaxcomm/prefs.cc 2005-04-13
12:28:11.000000000 +0200
-+++ /tmp/dpep.fuiNPa/iaxclient-20050503/simpleclient/iaxcomm/prefs.cc
2005-05-10 22:29:33.007919517 +0200
+diff -urNad iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/prefs.cc
iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/prefs.cc
+--- iaxclient-0.0+cvs20051124~/simpleclient/iaxcomm/prefs.cc 2005-11-24
13:20:25.000000000 +0100
++++ iaxclient-0.0+cvs20051124/simpleclient/iaxcomm/prefs.cc 2005-11-24
13:20:36.000000000 +0100
@@ -125,7 +125,9 @@
bool bCont;
wxString str;
- wxXmlResource::Get()->LoadDialog(this, parent, wxT("Prefs"));
+ if ( !wxXmlResource::Get()->LoadDialog(this, parent, wxT("Prefs")) ) {
-+ wxFatalError(_("Can't load Prefs dialog"));
++ wxLogError(_("Can't load Prefs dialog"));
+ }
// Reach in for our controls
diff -ruNad iaxclient-0.0+cvs20050725/debian/patches/12_autoconf_gen.dpatch
iaxclient-0.0+cvs20051124/debian/patches/12_autoconf_gen.dpatch
--- iaxclient-0.0+cvs20050725/debian/patches/12_autoconf_gen.dpatch
2005-11-23 21:45:36.000000000 +0100
+++ iaxclient-0.0+cvs20051124/debian/patches/12_autoconf_gen.dpatch
2005-11-24 13:37:02.000000000 +0100
@@ -39,6 +39,8 @@
+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and
run a test GTK program],
+ , enable_gtktest=yes)
+
++gtk_config_args="gtk+-2.0"
++
+ for module in . $4
+ do
+ case "$module" in
@@ -51,17 +53,17 @@
+ if test x$gtk_config_exec_prefix != x ; then
+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+ if test x${GTK_CONFIG+set} != xset ; then
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++ GTK_CONFIG=$gtk_config_exec_prefix/bin/pkg-config
+ fi
+ fi
+ if test x$gtk_config_prefix != x ; then
+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+ if test x${GTK_CONFIG+set} != xset ; then
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++ GTK_CONFIG=$gtk_config_prefix/bin/pkg-config
+ fi
+ fi
+
-+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
++ AC_PATH_PROG(GTK_CONFIG, pkg-config, no)
+ min_gtk_version=ifelse([$1], ,0.99.7,$1)
+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+ no_gtk=""
@@ -70,11 +72,11 @@
+ else
+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
++ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --modversion | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
++ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --modversion | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
++ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --modversion | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_gtktest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
@@ -32735,6 +32737,8 @@
+ enable_gtktest=yes
+fi;
+
++gtk_config_args="gtk+-2.0"
++
+ for module in .
+ do
+ case "$module" in
@@ -32747,13 +32751,13 @@
+ if test x$gtk_config_exec_prefix != x ; then
+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+ if test x${GTK_CONFIG+set} != xset ; then
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++ GTK_CONFIG=$gtk_config_exec_prefix/bin/pkg-config
+ fi
+ fi
+ if test x$gtk_config_prefix != x ; then
+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+ if test x${GTK_CONFIG+set} != xset ; then
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++ GTK_CONFIG=$gtk_config_prefix/bin/pkg-config
+ fi
+ fi
+
@@ -32806,11 +32810,11 @@
+ else
+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
++ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --modversion | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
++ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --modversion | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
++ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --modversion | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+ if test "x$enable_gtktest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
diff -ruNad
iaxclient-0.0+cvs20050725/debian/patches/46_audio_encode_include_speex_prepocess.dpatch
iaxclient-0.0+cvs20051124/debian/patches/46_audio_encode_include_speex_prepocess.dpatch
---
iaxclient-0.0+cvs20050725/debian/patches/46_audio_encode_include_speex_prepocess.dpatch
1970-01-01 01:00:00.000000000 +0100
+++
iaxclient-0.0+cvs20051124/debian/patches/46_audio_encode_include_speex_prepocess.dpatch
2005-11-24 13:37:02.000000000 +0100
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 46_audio_encode_include_speex_prepocess.dpatch by Antonio Ospite <[EMAIL
PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Include speex/speex_preprocess.h
+
[EMAIL PROTECTED]@
+diff -pruN iaxclient-0.0+cvs20051124_orig/lib/audio_encode.c
iaxclient-0.0+cvs20051124/lib/audio_encode.c
+--- iaxclient-0.0+cvs20051124_orig/lib/audio_encode.c 2005-11-24
11:49:05.000000000 +0100
++++ iaxclient-0.0+cvs20051124/lib/audio_encode.c 2005-11-24
12:10:29.000000000 +0100
+@@ -20,6 +20,8 @@
+ #include "codec_alaw.h"
+ #include "codec_speex.h"
+
++#include "speex/speex_preprocess.h"
++
+ double iaxc_silence_threshold = -9e99;
+
+ static double input_level = 0, output_level = 0;
+
diff -ruNad iaxclient-0.0+cvs20050725/debian/rules
iaxclient-0.0+cvs20051124/debian/rules
--- iaxclient-0.0+cvs20050725/debian/rules 2005-11-23 21:45:36.000000000
+0100
+++ iaxclient-0.0+cvs20051124/debian/rules 2005-11-24 13:37:02.000000000
+0100
@@ -14,8 +14,8 @@
include /usr/share/dpatch/dpatch.make
-CFLAGS = -Wall -g -D_REENTRANT --std=gnu99
-CXXFLAGS = -Wall -g -D_REENTRANT
+CFLAGS = -Wall -g -D_REENTRANT --std=gnu99 -D__UNICODE__ -DSPEEX_EC
+CXXFLAGS = -Wall -g -D_REENTRANT -D__UNICODE__
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -28,9 +28,9 @@
INSTALL_PROGRAM += -s
endif
ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- WX_CONFIG_NAME = wxgtk-2.4-config
+ WX_CONFIG_NAME = wx-config
else
- WX_CONFIG_NAME = wxgtkd-2.4-config
+ WX_CONFIG_NAME = wxd-config
endif
autoreconf:
@@ -44,7 +44,7 @@
dh_testdir
test -z objs || mkdir objs
- (cd objs && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
WX_CONFIG_NAME="$(WX_CONFIG_NAME)" ../configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info --disable-local-portaudio --disable-local-gsm
--disable-local-speex --disable-shared --enable-clients="testcall iaxcomm")
+ (cd objs && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
WX_CONFIG_NAME="$(WX_CONFIG_NAME)" GTK_CONFIG="/usr/bin/pkg-config"
../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
--disable-local-portaudio --disable-local-gsm --disable-local-speex
--disable-shared --enable-clients="testcall iaxcomm")
touch configure-stamp
#Architecture
