X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.ac;h=311ae15339e907e5f3295adb298dd25659d8d15a;hp=6bfbe85ea25052596105d96f3c5c026903d8cc06;hb=9149f18ce0f0f2910ab79e4ce75ff08e1de48790;hpb=fa77d1e726c67424f8df3b974db0641d78da2a43

diff --git a/configure.ac b/configure.ac
index 6bfbe85..311ae15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
-AC_INIT(src/ctsim.cpp)
+AC_INIT
+AC_CONFIG_SRCDIR([src/ctsim.cpp])
 AM_INIT_AUTOMAKE(ctsim,3.5.0)
 AM_CONFIG_HEADER(config.h)
 
@@ -13,18 +14,12 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
-CPPFLAGS='$(CPPFLAGS) -DDATADIR="$(datadir)"'
-CFLAGS="$CFLAGS -I/usr/local/include"
-LDFLAGS="$LDFLAGS -L/usr/local/lib"
 AC_PROG_CC
 AC_PROG_CXX
 AC_C_BIGENDIAN
 
 AC_PATH_PROG(wxconfig,wx-config)
 
-dnl AC_MSG_CHECKING([that the compiler works])
-dnl AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],     AC_MSG_RESULT(yes),     AC_MSG_RESULT(no)     AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.),     AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.))
-
 dnl Check for C operation
 AC_CANONICAL_HOST 
 AC_C_INLINE
@@ -34,24 +29,24 @@ AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 
+dnl Add define templates
+
 dnl Checks for libraries.
 AC_CHECK_LIB(z, deflate, [ zlib="true" ], [ zlib="false" ;  AC_MSG_WARN([zlib missing. Will need zlib for PNG support])])
 AC_CHECK_LIB(m, sin)
 AC_CHECK_LIB(curses, main, [curses=true], [curses=false])
 AC_CHECK_LIB(ncurses, main, [ncurses=true], [ncurses=false])
-AC_CHECK_LIB(readline, main, [readline=true; AC_DEFINE(HAVE_READLINE)], [readline=false], [-lcurses])
-AC_CHECK_LIB(ncurses, main, [ncurses=true; AC_DEFINE(HAVE_NCURSES)], [ncurses=false])
-AC_CHECK_LIB(curses, main, [curses=true; AC_DEFINE(HAVE_CURSES)], [curses=false])
+AC_CHECK_LIB(readline, main, [readline=true; 
+                 AC_DEFINE([HAVE_READLINE],1,[Readline library])],
+		 [readline=false], [-lcurses])	
 wxwin=false
-AC_CHECK_LIB(wx_gtk-2.2, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
-AC_CHECK_LIB(wx, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
-AC_CHECK_LIB(hdf4, main, [hdf4=true], [hdf4=false], -lz)
-AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
+AC_CHECK_LIB(wx_gtk-2.2, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
+AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false])
 AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -lXt -lXext])
 AC_CHECK_LIB(pthread, main, [pthread=true], [pthread=false])
 
 if test "$zlib" = "true" ; then
-  AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
+  AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG,1,[PNG library])], [png=false])
 fi
 
 dnl Checks for header files.
@@ -81,7 +76,7 @@ fi
 
 if test "${getopt_long}" = "false" ; then
   my_includes="$my_includes -I../getopt"
-  AC_DEFINE(HAVE_GETOPT_LONG)
+  AC_DEFINE(HAVE_GETOPT_LONG,1,[getopt_long library])
   ctlibs_base="$ctlibs_base -lgetopt"
   LDFLAGS="$LDFLAGS -L../getopt"
   AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1)
@@ -113,23 +108,29 @@ esac],
 [debug=false; AC_MSG_RESULT(no)])
 AM_CONDITIONAL(DEBUG, test "$debug" = "true")
 
+if test "$datadir" != "" ; then
+  CPPFLAGS="$CPPFLAGS -DDATADIR=\"\\\"$datadir\\\"\""
+fi
+dnl CFLAGS="$CFLAGS -I/usr/local/include"
+dnl LDFLAGS="$LDFLAGS -L/usr/local/lib"
+
 if test "$debug" = "true" ; then
-  CFLAGS="-g -DDEBUG"
-  AC_DEFINE(DEBUG)
+  CFLAGS="$CFLAGS -g -DDEBUG"
+  AC_DEFINE(DEBUG,1,[turn on debugging])
 else
-  CFLAGS="-O3 -DNDEBUG -fomit-frame-pointer"
-  AC_DEFINE(NDEBUG)
+  CFLAGS="$CFLAGS -O3 -DNDEBUG -fomit-frame-pointer"
+  AC_DEFINE(NDEBUG,1,[no debugging])
 fi
 
 if test "${pthread}" = "true" ; then
   CFLAGS="$FLAGS -pthread -D_REENTRANT"
-  AC_DEFINE(HAVE_WXTHREADS)
+  AC_DEFINE(HAVE_WXTHREADS,1,[have wxthreads library])
 fi
 
 AC_MSG_CHECKING(sstream)
  if [ test -f /usr/include/sstream || test -f /usr/include/g++/sstream ||
      test -f /usr/include/g++-2/sstream || test -f /usr/include/g++-3/sstream ]; then
-  AC_DEFINE(HAVE_SSTREAM)
+  AC_DEFINE(HAVE_SSTREAM,1,[sstream header])
   AC_MSG_RESULT(yes)
 fi
 AC_MSG_RESULT(no)
@@ -222,7 +223,7 @@ if test "$withval" != "no" ; then
       fi
       ctndir="$testctndir"
       ctn="true"
-      AC_DEFINE(HAVE_CTN_DICOM)
+      AC_DEFINE(HAVE_CTN_DICOM,1,[ctn dicom library])
       break
     fi
   done
@@ -308,7 +309,7 @@ dnl Check whether libXt has thread support.  Some platforms may have
 dnl pthread support in libc, but no thread support in libXt/libX11.
 our_saved_LDFLAGS="$LDFLAGS"
 LDFLAGS="$X_LIBS $LDFLAGS"
-AC_CHECK_LIB(Xt, XtToolkitThreadInitialize, AC_DEFINE(X_THREAD_SUPPORT), , $X_PRE_LIBS $X_BASIC_LIBS $X_EXTRA_LIBS)
+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
@@ -316,8 +317,8 @@ 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), , -lX11 "$X_EXTRA_LIBS")
-AC_CHECK_LIB(Xext, XmbufQueryExtension, AC_DEFINE(HAVE_MBX_SUPPORT), , -lX11 "$X_EXTRA_LIBS")
+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"
@@ -335,7 +336,7 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 AC_MSG_CHECKING([for X])
 if test "$no_x" != "yes" ; then
-  AC_DEFINE(HAVE_X11)
+  AC_DEFINE(HAVE_X11,1,[X11 system])
   LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
   ctlib_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
@@ -347,7 +348,7 @@ if test "$no_x" != "yes" ; then
     fi
   fi
   if test "$wxwin" = "true" ; then
-    AC_DEFINE(HAVE_SGP)
+    AC_DEFINE(HAVE_SGP,1,[use sgp library])
     AM_CONDITIONAL(HAVE_SGP, test 1==1)
   fi
 else
@@ -386,7 +387,7 @@ esac],
 
 if test "$dmallocxx" = "true" -a "$usedmalloc" = "true" ; then
   ctlibs_tools="$ctlibs_tools -ldmallocxx"
-  AC_DEFINE(HAVE_DMALLOC)
+  AC_DEFINE(HAVE_DMALLOC,1,[dmalloc library])
   AC_MSG_RESULT(Using dmalloc)
 fi
 
@@ -409,7 +410,7 @@ esac],
 
 if test "$efence" = "true" -a "$useefence" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lefence"
-  AC_DEFINE(HAVE_EFENCE)
+  AC_DEFINE(HAVE_EFENCE,1,[efence library])
   AC_MSG_RESULT(Using efence)
 fi
 
@@ -442,4 +443,5 @@ fi
 
 CXXFLAGS="$CFLAGS"
 
-AC_OUTPUT(Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile helical/Makefile helical/sample-helical.sh)
+AC_CONFIG_FILES([Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile helical/Makefile helical/sample-helical.sh])
+AC_OUTPUT