Hello all,
although it is my first posting I simply skip introducing myself.
I ran into a build issue when building tntnet. I compiled cxxtools into
a "non-standard" directory (/home/blah/yada/yada/...). I modified $PATH
so cxxtools-config could get found. Nevertheless tntnet's configure
script quit because it failed to check the cxxtools-installation.
What I did to resolve this, was to remove named check from configure.in.
But then: another issue. :-/ cxxtools-config is actually (I found a
single demo that actually uses cxxtools) not really called when building
tntnet.
So what the attached patches (against the latest tntnet version) try to
resolve is to integrate cxxtools-config into the build process.
I am not an expert in automake/autoconf so what is attached is merely a
quick hack. I am quite sure, there must be an easier way to add calls to
`cxxtools-config --libs` as well as `cxxtools --cxxflags` by adding some
lines at a single place -- but since I don't know how to this I simply
modified all the Makefile.am of the tntnet distribution.
So attached are 2 patches against tntnet release 1.6.2:
001-*.patch: named configure.in quick hack. I am quite sure
you don't really want to integrate this
002-*.patch: contains the described changes to the Makefile.am files
Hope it helps,
Martin
global infinity GmbH | Tel.: 06421/983004-20 |
Geschaeftsfuehrer: Marcus Brindoepke
Gerhard-Jahn-Platz 1 | Fax: 06421/983004-90 | Amtsgericht Marburg,
HRB 5200
35037 Marburg | Web: www.globalinfinity.de
--- tntnet-1.6.2/configure.in 2008-04-20 22:52:21.000000000 +0200
+++ tntnet-1.6.2/configure.in.old 2008-05-27 09:34:55.000000000 +0200
@@ -33,20 +33,6 @@
AC_MSG_ERROR([cxxtools configuration script was not found])
fi
-AC_MSG_CHECKING([for cxxtools usability])
-AC_COMPILE_IFELSE(
- [#include <cxxtools/net.h>
- #include <cxxtools/pipe.h>
- void t() { cxxtools::net::Socket s;
- struct sockaddr_storage t = s.getSockAddr(); }
- ],
- AC_MSG_RESULT(yes),
- [
- AC_MSG_RESULT(no)
- AC_MSG_ERROR(please check your cxxtools-installation - maybe you need an upgrade)
- ]
- )
-
AC_CHECK_HEADER([zlib.h], , AC_MSG_ERROR([zlib not found]))
AC_ARG_WITH([epoll],
diff -ur tntnet-1.6.2.orig/framework/cgi/Makefile.am tntnet-1.6.2/framework/cgi/Makefile.am
--- tntnet-1.6.2.orig/framework/cgi/Makefile.am 2008-02-16 10:10:31.000000000 +0100
+++ tntnet-1.6.2/framework/cgi/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -4,6 +4,6 @@
cgi.cpp \
tnt/cgi.h
-libtntnet_cgi_la_CXXFLAGS = $(PTHREAD_CFLAGS)
-libtntnet_cgi_la_LDFLAGS = -version-info @sonumber@ $(PTHREAD_LIBS)
+libtntnet_cgi_la_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+libtntnet_cgi_la_LDFLAGS = -version-info @sonumber@ $(PTHREAD_LIBS) `${CXXTOOLS_CONFIG} --libs`
libtntnet_cgi_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
diff -ur tntnet-1.6.2.orig/framework/common/Makefile.am tntnet-1.6.2/framework/common/Makefile.am
--- tntnet-1.6.2.orig/framework/common/Makefile.am 2008-02-22 21:17:04.000000000 +0100
+++ tntnet-1.6.2/framework/common/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -105,8 +105,8 @@
tnt/ssl.h \
tnt/tcpjob.h
-libtntnet_la_CXXFLAGS = -DPKGLIBDIR=\"@libdir@/@[EMAIL PROTECTED]" $(PTHREAD_CFLAGS)
-libtntnet_la_LDFLAGS = -version-info @sonumber@ -lz -lcxxtools $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+libtntnet_la_CXXFLAGS = -DPKGLIBDIR=\"@libdir@/@[EMAIL PROTECTED]" $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+libtntnet_la_LDFLAGS = -version-info @sonumber@ -lz -lcxxtools $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
if MAKE_GNUTLS
libtntnet_la_SOURCES += \
diff -ur tntnet-1.6.2.orig/framework/defcomp/Makefile.am tntnet-1.6.2/framework/defcomp/Makefile.am
--- tntnet-1.6.2.orig/framework/defcomp/Makefile.am 2008-02-16 10:10:35.000000000 +0100
+++ tntnet-1.6.2/framework/defcomp/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -11,6 +11,6 @@
mimehandler.h \
static.h
-tntnet_la_CXXFLAGS = $(PTHREAD_CFLAGS)
-tntnet_la_LDFLAGS = -module -version-info @sonumber@ $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+tntnet_la_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+tntnet_la_LDFLAGS = -module -version-info @sonumber@ $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
tntnet_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
diff -ur tntnet-1.6.2.orig/framework/runtime/Makefile.am tntnet-1.6.2/framework/runtime/Makefile.am
--- tntnet-1.6.2.orig/framework/runtime/Makefile.am 2008-02-16 10:10:31.000000000 +0100
+++ tntnet-1.6.2/framework/runtime/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -5,8 +5,8 @@
process.cpp \
tnt/process.h
-tntnet_LDFLAGS = $(PTHREAD_LIBS)
+tntnet_LDFLAGS = $(PTHREAD_LIBS) `${CXXTOOLS_CONFIG} --libs`
tntnet_LDADD = $(top_builddir)/framework/common/libtntnet.la
-tntnet_CXXFLAGS=-DTNTNET_CONF=\"@sysconfdir@/tntnet/tntnet.conf\" -DTNTNET_PID=\"@localstatedir@/tntnet.pid\"
+tntnet_CXXFLAGS=-DTNTNET_CONF=\"@sysconfdir@/tntnet/tntnet.conf\" -DTNTNET_PID=\"@localstatedir@/tntnet.pid\" `${CXXTOOLS_CONFIG} --cxxflags`
AM_CXXFLAGS=$(PTHREAD_CFLAGS)
diff -ur tntnet-1.6.2.orig/Makefile.am tntnet-1.6.2/Makefile.am
--- tntnet-1.6.2.orig/Makefile.am 2008-02-16 10:11:09.000000000 +0100
+++ tntnet-1.6.2/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -1,5 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
+CXXFLAGS = `${CXXTOOLS_CONFIG} --cxxflags`
+
bin_SCRIPTS = tntnet-config
SUBDIRS = \
diff -ur tntnet-1.6.2.orig/sdk/demos/calc/Makefile.am tntnet-1.6.2/sdk/demos/calc/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/calc/Makefile.am 2008-02-16 10:10:29.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/calc/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -10,8 +10,8 @@
doc_DATA = $(EXTRA_DIST)
endif
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-calc_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+calc_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
calc_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/calcajax/Makefile.am tntnet-1.6.2/sdk/demos/calcajax/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/calcajax/Makefile.am 2008-02-16 10:10:30.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/calcajax/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -10,8 +10,8 @@
calcajax_js.js \
docalc.ecpp
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-calcajax_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+calcajax_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
calcajax_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/calci18n/Makefile.am tntnet-1.6.2/sdk/demos/calci18n/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/calci18n/Makefile.am 2008-02-16 10:10:29.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/calci18n/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -14,8 +14,8 @@
fi.png \
de.png
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-calci18n_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+calci18n_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
calci18n_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties calci18n.txt calci18n.fi calci18n.de
diff -ur tntnet-1.6.2.orig/sdk/demos/calcmvc/Makefile.am tntnet-1.6.2/sdk/demos/calcmvc/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/calcmvc/Makefile.am 2008-02-16 10:10:30.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/calcmvc/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -16,8 +16,8 @@
calcView.ecpp \
calcmvc.ecpp
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-calcmvc_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+calcmvc_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
calcmvc_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/chat/Makefile.am tntnet-1.6.2/sdk/demos/chat/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/chat/Makefile.am 2008-02-16 10:10:28.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/chat/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -19,8 +19,8 @@
smile.png \
wink.png
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-chat_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+chat_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
chat_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/comp/Makefile.am tntnet-1.6.2/sdk/demos/comp/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/comp/Makefile.am 2008-02-16 10:10:29.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/comp/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -12,8 +12,8 @@
subcomp.ecpp \
extcomp.ecpp
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-comp_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+comp_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
comp_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
extlib_la_LDFLAGS = -module $(PTHREAD_LIBS)
extlib_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
diff -ur tntnet-1.6.2.orig/sdk/demos/config/Makefile.am tntnet-1.6.2/sdk/demos/config/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/config/Makefile.am 2008-02-16 10:10:30.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/config/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -6,8 +6,8 @@
nodist_config_la_SOURCES = \
config.cpp
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-config_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+config_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
config_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/controls/Makefile.am tntnet-1.6.2/sdk/demos/controls/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/controls/Makefile.am 2008-02-16 10:10:30.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/controls/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -33,8 +33,8 @@
plus.png \
tntnet.conf
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-controls_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+controls_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
controls_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/cookie/Makefile.am tntnet-1.6.2/sdk/demos/cookie/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/cookie/Makefile.am 2008-02-16 10:10:30.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/cookie/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -6,9 +6,9 @@
EXTRA_DIST = \
cookie.ecpp
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-cookie_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-cookie_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+cookie_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
+cookie_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
CLEANFILES = cookie.cpp tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/hello/Makefile.am tntnet-1.6.2/sdk/demos/hello/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/hello/Makefile.am 2008-02-16 10:10:29.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/hello/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -8,8 +8,8 @@
hello.ecpp \
tntnet.jpg
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-hello_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+hello_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
hello_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/Makefile.am tntnet-1.6.2/sdk/demos/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/Makefile.am 2008-02-16 10:10:30.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -8,8 +8,8 @@
tntnet.conf \
demos.txt
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-alldemos_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+alldemos_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
alldemos_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/savepoint/Makefile.am tntnet-1.6.2/sdk/demos/savepoint/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/savepoint/Makefile.am 2008-02-16 10:10:30.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/savepoint/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -6,8 +6,8 @@
EXTRA_DIST = \
savepoint.ecpp
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-savepoint_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+savepoint_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
savepoint_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/session/Makefile.am tntnet-1.6.2/sdk/demos/session/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/session/Makefile.am 2008-02-16 10:10:28.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/session/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -8,8 +8,8 @@
session.ecpp \
appsession.ecpp
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-session_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+session_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
session_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/sprintf/Makefile.am tntnet-1.6.2/sdk/demos/sprintf/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/sprintf/Makefile.am 2008-02-16 10:10:28.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/sprintf/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -8,8 +8,8 @@
sprintf.ecpp \
subcomp.ecpp
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-sprintf_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+sprintf_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
sprintf_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/strings/Makefile.am tntnet-1.6.2/sdk/demos/strings/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/strings/Makefile.am 2008-02-16 10:10:29.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/strings/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -6,8 +6,8 @@
EXTRA_DIST = \
strings.ecpp
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-strings_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+strings_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
strings_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/demos/upload/Makefile.am tntnet-1.6.2/sdk/demos/upload/Makefile.am
--- tntnet-1.6.2.orig/sdk/demos/upload/Makefile.am 2008-02-16 10:10:28.000000000 +0100
+++ tntnet-1.6.2/sdk/demos/upload/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -6,8 +6,8 @@
EXTRA_DIST = \
upload.ecpp
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-upload_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+upload_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@ `${CXXTOOLS_CONFIG} --libs`
upload_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
noinst_DATA = tntnet.conf tntnet.properties
diff -ur tntnet-1.6.2.orig/sdk/tools/common/Makefile.am tntnet-1.6.2/sdk/tools/common/Makefile.am
--- tntnet-1.6.2.orig/sdk/tools/common/Makefile.am 2008-02-16 10:10:26.000000000 +0100
+++ tntnet-1.6.2/sdk/tools/common/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -13,5 +13,5 @@
tnt/filename.h \
tnt/stringescaper.h
-libtntnet_sdk_la_CXXFLAGS = $(PTHREAD_CFLAGS)
-libtntnet_sdk_la_LDFLAGS = -version-info @sonumber@ -lcxxtools $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
+libtntnet_sdk_la_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+libtntnet_sdk_la_LDFLAGS = -version-info @sonumber@ `${CXXTOOLS_CONFIG} --libs` $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
diff -ur tntnet-1.6.2.orig/sdk/tools/ecppc/Makefile.am tntnet-1.6.2/sdk/tools/ecppc/Makefile.am
--- tntnet-1.6.2.orig/sdk/tools/ecppc/Makefile.am 2008-02-16 10:10:28.000000000 +0100
+++ tntnet-1.6.2/sdk/tools/ecppc/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -23,5 +23,5 @@
ecppc_LDADD = $(top_builddir)/framework/common/libtntnet.la $(top_builddir)/sdk/tools/common/libtntnet_sdk.la
AM_CPPFLAGS = -I$(top_builddir)/sdk/tools/common
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-AM_LDFLAGS = -lcxxtools $(PTHREAD_LIBS)
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+AM_LDFLAGS = `${CXXTOOLS_CONFIG} --libs` $(PTHREAD_LIBS)
diff -ur tntnet-1.6.2.orig/sdk/tools/ecppl/Makefile.am tntnet-1.6.2/sdk/tools/ecppl/Makefile.am
--- tntnet-1.6.2.orig/sdk/tools/ecppl/Makefile.am 2008-02-16 10:10:25.000000000 +0100
+++ tntnet-1.6.2/sdk/tools/ecppl/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -8,5 +8,5 @@
ecppl_LDADD = $(top_builddir)/sdk/tools/common/libtntnet_sdk.la
AM_CPPFLAGS = -I$(top_builddir)/sdk/tools/common
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-AM_LDFLAGS = -lcxxtools $(PTHREAD_LIBS)
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+AM_LDFLAGS = `${CXXTOOLS_CONFIG} --libs` $(PTHREAD_LIBS)
diff -ur tntnet-1.6.2.orig/sdk/tools/ecppll/Makefile.am tntnet-1.6.2/sdk/tools/ecppll/Makefile.am
--- tntnet-1.6.2.orig/sdk/tools/ecppll/Makefile.am 2008-02-16 10:10:25.000000000 +0100
+++ tntnet-1.6.2/sdk/tools/ecppll/Makefile.am 2008-05-27 11:02:13.000000000 +0200
@@ -6,5 +6,5 @@
ecppll_LDADD = $(top_builddir)/sdk/tools/common/libtntnet_sdk.la
AM_CPPFLAGS = -I$(top_builddir)/sdk/tools/common
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-AM_LDFLAGS = -lcxxtools $(PTHREAD_LIBS)
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) `${CXXTOOLS_CONFIG} --cxxflags`
+AM_LDFLAGS = `${CXXTOOLS_CONFIG} --libs` $(PTHREAD_LIBS)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Tntnet-general mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tntnet-general
