AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,3.5.0)
+AM_INIT_AUTOMAKE(ctsim,3.5.5)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
CFLAGS="$CFLAGS -g -DDEBUG"
AC_DEFINE(DEBUG,1,[turn on debugging])
else
- CFLAGS="$CFLAGS -O3 -DNDEBUG -fomit-frame-pointer"
+ CFLAGS="$CFLAGS -O3 -DNDEBUG -fomit-frame-pointer -funroll-loops"
AC_DEFINE(NDEBUG,1,[no debugging])
fi
if test "${pthread}" = "true" ; then
- CFLAGS="$FLAGS -pthread -D_REENTRANT"
+ CFLAGS="$CFLAGS -pthread -D_REENTRANT"
AC_DEFINE(HAVE_WXTHREADS,1,[have wxthreads library])
fi
fi ]
)
-if test "$withval" != "no" ; then
- if test "$prefix" != "NONE" ; then
- tryctndir="$tryctndir $prefix"
- fi
-
+if test "$withval" == "no" -o "$withval" == "NONE" ; then
AC_MSG_CHECKING([for CTN DICOM installation])
- for testctndir in "." $tryctndir /usr/local /usr/local/ctn /usr /usr/ctn /opt /opt/ctn ; do
- if test -f "$testctndir/lib/libctn.a" ; then
- if test "$testctndir" != "/usr"; then
- LDFLAGS="$LDFLAGS -L$testctndir/lib"
- CFLAGS="$CFLAGS -I$testctndir/include"
- fi
- ctndir="$testctndir"
- ctn="true"
- AC_DEFINE(HAVE_CTN_DICOM,1,[ctn dicom library])
+ AC_MSG_RESULT([disabled])
+else
+ AC_MSG_CHECKING([for CTN DICOM installation])
+ for testctndir in $tryctndir/lib /usr/local/lib /usr/local/ctn/lib /usr/lib /usr/ctn/lib /usr/lib/ctn /opt/ctn/lib ; do
+ if test -f "$testctndir/libctn.a" ; then
+ LDFLAGS="$LDFLAGS -L$testctndir"
+ ctnlib="true"
break
fi
done
- AC_MSG_RESULT($ctndir)
-else
- AC_MSG_RESULT([no])
+ for testctndir in $tryctndir/include /usr/local/include /usr/local/ctn/include /usr/include /usr/include/ctn /usr/ctn/include /opt/ctn/include ; do
+ if test -f "$testctndir/ctn_os.h" ; then
+ CFLAGS="$CFLAGS -I$testctndir"
+ ctninclude="true"
+ break
+ fi
+ done
+ if test "$ctnlib" == "true" -a "$ctninclude" == "true" ; then
+ ctn="true"
+ AC_DEFINE(HAVE_CTN_DICOM,1,[ctn dicom library])
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
fi
-
AC_MSG_CHECKING([for web access])
dnl Set cgi-bin directory
AC_ARG_WITH(cgibin-dir, [ --with-cgibin-dir=PATH Set path of CGI binaries directory ],
AC_CHECK_LIB(Xt, XtToolkitThreadInitialize, AC_DEFINE(X_THREAD_SUPPORT,1,[x thread supported]), , $X_PRE_LIBS $X_BASIC_LIBS $X_EXTRA_LIBS)
LDFLAGS="$our_saved_LDFLAGS"
-dnl Check in -lXext for double buffering extensions to X11, and check
-dnl whether appropriate header files are present. (Some systems have one
-dnl but not the other.)
-our_saved_LDFLAGS="$LDFLAGS"
-LDFLAGS="$X_LIBS $LDFLAGS"
-AC_CHECK_LIB(Xext, XdbeQueryExtension, AC_DEFINE(HAVE_DBE_SUPPORT,1,[x dbe support]), , -lX11 "$X_EXTRA_LIBS")
-AC_CHECK_LIB(Xext, XmbufQueryExtension, AC_DEFINE(HAVE_MBX_SUPPORT,1,[x mbx support]), , -lX11 "$X_EXTRA_LIBS")
-LDFLAGS="$our_saved_LDFLAGS"
-our_saved_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-AC_CHECK_HEADERS(X11/extensions/Xdbe.h X11/extensions/multibuf.h)
-CPPFLAGS="$our_saved_CPPFLAGS"
-
dnl Our Makefile.am files test the automake variable NO_X to determine
dnl whether X should be supported.
AM_CONDITIONAL(NO_X, test "x$no_x" = "xyes")