File xmedcon-0.16.2.dif of Package xmedcon
---
Makefile.in | 2 +-
acinclude.m4 | 4 +++-
configure.ac | 10 +++++-----
etc/Makefile.am | 2 +-
etc/Makefile.in | 2 +-
libs/Makefile.in | 2 +-
libs/nifti/nifti1_io.c | 2 +-
7 files changed, 13 insertions(+), 11 deletions(-)
--- Makefile.in
+++ Makefile.in 2024-03-05 14:35:00.184169209 +0000
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/macros/ax_prefix_config_h.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/ltoptions.m4 \
--- acinclude.m4
+++ acinclude.m4 2024-03-05 14:35:00.184169209 +0000
@@ -42,7 +42,9 @@ dnl MDC_CHECK_GUI(GTKSUPPORTED)
AC_DEFUN([MDC_CHECK_GUI],[
AC_MSG_CHECKING([for GUI support])
if test $1 -eq 1; then
- if test x${prefix} != xNONE ; then
+ if test x${sysconfdir} != x ; then
+ XMDCETC=${sysconfdir}
+ elif test x${prefix} != xNONE ; then
XMDCETC=${prefix}/etc
else
XMDCETC=${ac_default_prefix}/etc
--- configure.ac
+++ configure.ac 2024-03-05 14:35:18.287836339 +0000
@@ -46,6 +46,9 @@ XMEDCON_LIBVERS="${XMEDCON_PRGR} ${XMEDC
dnl Do not use env variable, not set yet for this.
AC_PREFIX_DEFAULT([/usr/local/xmedcon])
+dnl Keep correct libtool macros in-tree
+AC_CONFIG_MACRO_DIR([macros])
+
dnl Do some specific configurations.
echo ""
echo "BEGIN SPECIFIC CONFIG:"
@@ -83,7 +86,7 @@ AC_ARG_ENABLE(gif,
ENABLE_GIF=0
;;
*)
- AC_CACHE_VAL(mdc_cv_include_acr,mdc_cv_include_gif=yes)
+ AC_CACHE_VAL(mdc_cv_include_gif,mdc_cv_include_gif=yes)
ENABLE_GIF=1
;;
esac ],
@@ -563,7 +566,7 @@ AC_ARG_WITH(tpc-prefix,
, tpc_prefix="$withval", tpc_prefix="")
if test x"$tpc_prefix" != x; then
TPC_LDFLAGS="-L$tpc_prefix/lib -ltpcimgio -L$tpc_prefix/lib -ltpcmisc"
- TPC_CFLAGS="-I$tpc_prefix/include"
+ TPC_CFLAGS="-I$tpc_prefix/include/libtpcimgio0 -I$tpc_prefix/include/libtpcmisc0"
LDFLAGS="$LDFLAGS $TPC_LDFLAGS"
CPPFLAGS="$CPPFLAGS $TPC_CFLAGS"
else
@@ -713,9 +716,6 @@ dnl Checks for gzip or compress.
AC_CHECK_PROGS(DECOMPRESS, [gunzip uncompress], none)
-dnl Keep correct libtool macros in-tree
-AC_CONFIG_MACRO_DIR([macros])
-
AC_CONFIG_FILES([
Makefile
xmedcon-config
--- etc/Makefile.am
+++ etc/Makefile.am 2024-03-05 14:35:00.188169134 +0000
@@ -25,7 +25,7 @@ ICONS = xmedcon.ico xmedcon.png
GTK_DIST = README $(CSS_FILES) $(ICONS)
-sysconfdir = $(prefix)/etc
+sysconfdir = @sysconfdir@
sysconf_DATA = xmedcon.css
appdatadir = $(datadir)/appdata
--- etc/Makefile.in
+++ etc/Makefile.in 2024-03-05 14:35:00.188169134 +0000
@@ -335,7 +335,7 @@ runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
-sysconfdir = $(prefix)/etc
+sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
--- libs/Makefile.in
+++ libs/Makefile.in 2024-03-05 14:35:00.188169134 +0000
@@ -195,7 +195,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -fPIC
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSCOPE = @CSCOPE@
--- libs/nifti/nifti1_io.c
+++ libs/nifti/nifti1_io.c 2024-03-05 14:35:00.188169134 +0000
@@ -461,7 +461,7 @@ void nifti_disp_lib_hist( void )
*//*--------------------------------------------------------------------*/
void nifti_disp_lib_version( void )
{
- printf("%s, compiled %s\n", gni_version, __DATE__);
+ printf("%s, compiled for openSUSE\n", gni_version);
}