projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r7930: fixes for backproject and pjrec
[ctsim.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index e9f4c40389fa97e3115bb88eedd10303a38062fc..c684ec16aae13b32d4dfe035a2a15ed338d6964a 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-6,7
+6,7
@@
dnl CDPATH=
AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
AM_MAINTAINER_MODE
AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE(ctsim,4.2.
6
)
+AM_INIT_AUTOMAKE(ctsim,4.2.
7
)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
@@
-84,7
+84,7
@@
if test "${getopt_long}" = "false" ; then
LDFLAGS="$LDFLAGS -L../getopt"
GETOPTLONG=1
fi
LDFLAGS="$LDFLAGS -L../getopt"
GETOPTLONG=1
fi
-AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test
$GETOPTLONG==1
)
+AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test
"$GETOPTLONG"="1"
)
if test "${readline}" = "true" ; then
ctlibs_base="$ctlibs_base -lreadline"
if test "${readline}" = "true" ; then
ctlibs_base="$ctlibs_base -lreadline"
@@
-364,12
+364,13
@@
if test "$no_x" != "yes" ; then
fi
if test "$wxwin" = "true" ; then
AC_DEFINE(HAVE_SGP,1,[use sgp library])
fi
if test "$wxwin" = "true" ; then
AC_DEFINE(HAVE_SGP,1,[use sgp library])
- AM_CONDITIONAL(HAVE_SGP, test 1==1)
fi
else
AC_MSG_RESULT(no)
fi
fi
else
AC_MSG_RESULT(no)
fi
+AM_CONDITIONAL(HAVE_SGP, test "$wxwin" = "true")
+
if test "$png" = "true" ; then
ctlibs_tools="$ctlibs_tools -lpng"
fi
if test "$png" = "true" ; then
ctlibs_tools="$ctlibs_tools -lpng"
fi
@@
-439,10
+440,10
@@
if test "$wxwin" = "true" ; then
fi
CFLAGS="$CFLAGS -I../include $wxcflags"
ctlib_graphics="$ctlib_graphics $wxlibs"
fi
CFLAGS="$CFLAGS -I../include $wxcflags"
ctlib_graphics="$ctlib_graphics $wxlibs"
- AM_CONDITIONAL(HAVE_WXWINDOWS, test 1==1 )
fi
AC_SUBST(wxcflags)
AC_SUBST(wxlibs)
fi
AC_SUBST(wxcflags)
AC_SUBST(wxlibs)
+AM_CONDITIONAL(HAVE_WXWINDOWS, test "$wxwin"="true")
dnl Setting projet libraries and includes
LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim"
dnl Setting projet libraries and includes
LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim"