/[gentoo-x86]/media-gfx/kst/files/kst-1.1.0-netcdf-fix.patch
Gentoo

Contents of /media-gfx/kst/files/kst-1.1.0-netcdf-fix.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download) (as text)
Fri Dec 4 17:54:27 2009 UTC (10 years, 8 months ago) by ssuominen
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
File MIME type: text/x-diff
FILE REMOVED
Remove masked kst and potracegui.

1 --- configure.in 2005-10-27 00:25:05.000000000 -0300
2 +++ configure.in 2005-10-27 00:22:25.000000000 -0300
3 @@ -156,7 +156,7 @@
4 AC_HELP_STRING([--with-cdf=DIR],[where the root of CDF is installed ]),
5 [ ac_cdf_includes="-I$withval/include"
6 ac_cdf_libraries="-L$withval/lib"
7 - ])
8 + ])
9
10 all_includes_save="$all_includes"
11 all_includes="$all_includes $ac_cdf_includes"
12 @@ -182,32 +182,43 @@
13 # netCDF Test
14 ac_netcdf_includes=""
15 ac_netcdf_libraries=""
16 -AC_ARG_WITH(netcdf,
17 - AC_HELP_STRING([--with-netcdf=DIR],[where the root of NetCDF is installed ]),
18 - [ ac_netcdf_includes="-I$withval/include"
19 - ac_netcdf_libraries="-L$withval/lib"
20 - ])
21 -
22 -all_includes_save="$all_includes"
23 -all_includes="$all_includes $ac_netcdf_includes"
24 -KDE_CHECK_HEADER(netcdfcpp.h, AC_DEFINE(HAVE_NETCDFCPP_H, 1, [If we have NetCDF CPP headers]) have_netcdfcpp_h=yes NETCDFINCLUDES="$ac_netcdf_includes", , )
25 -all_includes="$all_includes_save"
26 +NETCDFLIBS=""
27
28 -ldflags_save="$LDFLAGS"
29 -LDFLAGS="$LDFLAGS $ac_netcdf_libraries"
30 -KDE_CHECK_LIB(netcdf, nc_open, NETCDFLIBS="$ac_netcdf_libraries -lnetcdf_c++ -lnetcdf $NETCDFLIBS", , )
31 -LDFLAGS="$ldflags_save"
32 -
33 -if test $ac_cv_lib_netcdf_nc_open = yes; then
34 - if test $have_netcdfcpp_h = yes; then
35 - AC_SUBST(NETCDFLIBS)
36 - AC_SUBST(NETCDFINCLUDES)
37 - AC_DEFINE(KST_HAVE_NETCDF, 1, [If we have the NetCDF libraries.])
38 - fi
39 +AC_MSG_CHECKING([--enable-netcdf argument])
40 +AC_ARG_ENABLE(netcdf,
41 + [ --enable-netcdf enable netcdf support.],
42 + [ enable_netcdf=$enableval ],
43 + [ enable_netcdf="no" ])
44 +
45 +if test "$enable_netcdf" = "yes"; then
46 + AC_ARG_WITH(netcdf,
47 + AC_HELP_STRING([--with-netcdf=DIR],[where the root of NetCDF is installed ]),
48 + [ ac_netcdf_includes="-I$withval/include"
49 + ac_netcdf_libraries="-L$withval/lib"
50 + ])
51 +
52 + all_includes_save="$all_includes"
53 + all_includes="$all_includes $ac_netcdf_includes"
54 + KDE_CHECK_HEADER(netcdfcpp.h, AC_DEFINE(HAVE_NETCDFCPP_H, 1, [If we have NetCDF CPP headers]) have_netcdfcpp_h=yes NETCDFINCLUDES="$ac_netcdf_includes", , )
55 + all_includes="$all_includes_save"
56 +
57 + ldflags_save="$LDFLAGS"
58 + LDFLAGS="$LDFLAGS $ac_netcdf_libraries"
59 + KDE_CHECK_LIB(netcdf, nc_open, NETCDFLIBS="$ac_netcdf_libraries -lnetcdf_c++ -lnetcdf $NETCDFLIBS", , )
60 + LDFLAGS="$ldflags_save"
61 +
62 + if test $ac_cv_lib_netcdf_nc_open = yes; then
63 + if test $have_netcdfcpp_h = yes; then
64 + AC_SUBST(NETCDFLIBS)
65 + AC_SUBST(NETCDFINCLUDES)
66 + AC_DEFINE(KST_HAVE_NETCDF, 1, [If we have the NetCDF libraries.])
67 + fi
68 + fi
69 fi
70
71 AM_CONDITIONAL(include_netcdf, test -n "$NETCDFLIBS")
72
73 +
74 # Readline and ncurses check
75 KDE_CHECK_HEADER(readline/readline.h, AC_DEFINE(HAVE_READLINE_H, 1, [If we have libreadline headers]) have_readline_h=yes, , )
76 KDE_CHECK_LIB(readline, rl_cleanup_after_signal, LIBREADLINE="-lreadline -lncurses", , -lncurses)

  ViewVC Help
Powered by ViewVC 1.1.20