1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Author: Olly Betts <olly@survex.com>
Description: Update configure.in to match what it must have said when configure was generated.
One thing I should probably explain about the patch as my change may
seem odd otherwise - upstream's configure.in says "USE_SVG=0" but the
generated configure says "USE_SVG=1", so I've simply updated
configure.in to match what it must have said when configure was
generated.
Forwarded: no
--- tv-0.5.orig/configure.in
+++ tv-0.5/configure.in
@@ -54,7 +54,7 @@
# The reason for this is wxGTK RPMs from wxWidgets.org
# do not have the required SVG library (which is a contribution)
AC_MSG_CHECKING(whether we will use SVG)
-USE_SVG=0
+USE_SVG=1
WX_SVG_LIB=
if test "$USE_SVG" = 0 ; then
AC_MSG_RESULT(no)
@@ -66,7 +66,9 @@
case "$wx_version" in
2.4.*) WX_SVG_LIB=[`$WX_CONFIG --basename`_dcsvg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`]
;;
- *) WX_SVG_LIB=[`$WX_CONFIG --basename`_svg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`]
+ 2.*) WX_SVG_LIB=[`$WX_CONFIG --basename`_svg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`]
+ ;;
+ *) WX_SVG_LIB=
;;
esac
@@ -76,7 +78,7 @@
if test "$USE_SVG" = 1 ; then
CXXFLAGS="$CXXFLAGS -DUSE_SVG"
- LIBS="$LIBS -l$WX_SVG_LIB"
+ test -n "$WX_SVG_LIB" && LIBS="$LIBS -l$WX_SVG_LIB"
fi
AC_OUTPUT(Makefile ncl-2.0/Makefile ncl-2.0/src/Makefile TreeLib/Makefile tv.spec)
|
