X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.ac;h=f206d6574eef5def6da78e619a415a7a79b15cbb;hp=d6cacfb1cd4a8c77ec112c575641e7db6e198653;hb=b3db4c787d9180525a56306d8e91553d81def8b8;hpb=0695e3d02bf8911708d191ac8490b7adcd8bb73a

diff --git a/configure.ac b/configure.ac
index d6cacfb..f206d65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,8 @@ dnl CDPATH=
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,3.5.6)
+AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE(ctsim,4.5.1)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -18,7 +19,10 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_C_BIGENDIAN
 
-AC_PATH_PROG(wxconfig,wx-config)
+AC_PATH_PROG(wxconfig,wxgtk-2.4-config)
+if [ ! "$wxconfig" ]; then
+  AC_PATH_PROG(wxconfig,wx-config)
+fi
 
 dnl Check for C operation
 AC_CANONICAL_HOST 
@@ -40,13 +44,14 @@ 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,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(wx_gtk-2.4, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])], [], [-L/usr/lib64 -L/usr/lib `gtk-config --libs` `glib-config --libs glib gmodule gthread` ])
+AC_CHECK_LIB(wx_mac-2.4, main, [wxwin=true; wx_mac=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
+AC_CHECK_LIB(fftw3, fftw_malloc, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false], [-L/usr/lib64 -L/usr/lib])
+AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -L/usr/X11R6/lib64])
 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,1,[PNG library])], [png=false])
+  AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG,1,[PNG library])], [png=false], [-lz -lm])
 fi
 
 dnl Checks for header files.
@@ -61,12 +66,13 @@ AC_STRUCT_TM
 
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep vsprintf vsnprintf)
+AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep vsprintf vsnprintf basename setjmp setpriority time gettimeofday getenv)
 AC_CHECK_FUNC(basename)
 AC_CHECK_FUNC(setjmp)
 AC_CHECK_FUNC(setpriority)
 AC_CHECK_FUNC(time)
 AC_CHECK_FUNC(gettimeofday)
+AC_CHECK_FUNC(getopt, [ getopt=true ], [ getopt=false ])
 
 if test "${OSTYPE}" = "cygwin" ; then
   getopt_long=false
@@ -79,8 +85,9 @@ if test "${getopt_long}" = "false" ; then
   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)
+  GETOPTLONG=1
 fi
+AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test "$GETOPTLONG"="1")
 
 if test "${readline}" = "true" ; then
   ctlibs_base="$ctlibs_base -lreadline"
@@ -118,22 +125,24 @@ if test "$debug" = "true" ; then
   CFLAGS="$CFLAGS -g -DDEBUG"
   AC_DEFINE(DEBUG,1,[turn on debugging])
 else
-  CFLAGS="$CFLAGS -O3 -DNDEBUG -fomit-frame-pointer -funroll-loops"
+  CFLAGS="$CFLAGS -O2 -DNDEBUG -fomit-frame-pointer"
   AC_DEFINE(NDEBUG,1,[no debugging])
 fi
 
 if test "${pthread}" = "true" ; then
-  CFLAGS="$CFLAGS -D_REENTRANT"
+dnl  CFLAGS="$CFLAGS -D_REENTRANT"
   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,1,[sstream header])
-  AC_MSG_RESULT(yes)
-fi
-AC_MSG_RESULT(no)
+     test -f /usr/include/g++-2/sstream || test -f /usr/include/g++-3/sstream ||
+     test -f /usr/include/gcc/darwin/3.1/g++-v3/sstream ]; then
+   AC_DEFINE(HAVE_SSTREAM,1,[sstream header])
+   AC_MSG_RESULT(yes)
+  else
+   AC_MSG_RESULT(no)
+ fi
 
 
 CFLAGS="$CFLAGS -Wall"
@@ -155,7 +164,7 @@ AC_ARG_ENABLE(verbose-warnings,
 AC_MSG_CHECKING(static executables)
 AC_ARG_ENABLE(static,
 [  --enable-static
-                          Enable static executables.],
+                            Enable static executables.],
 [ case "$enableval" in
   yes)
     AC_MSG_RESULT(yes)
@@ -169,7 +178,7 @@ AC_ARG_ENABLE(static,
 
 dnl Set LAM path
 AC_ARG_WITH(lam,
-[  --with-lam[=PATH]       Set path of LAM MPI ],
+[  --with-lam[=PATH]         Set path of LAM MPI ],
 [    if test "$withval" != "no" ; then
          trylamdir=$withval
      fi ]
@@ -203,7 +212,7 @@ fi
 
 dnl Set CTN path
 AC_ARG_WITH(ctn,
-[  --with-ctn[=PATH]       Set path of CTN DICOM library ],
+[  --with-ctn[=PATH]         Set path of CTN DICOM library ],
 [    if test "$withval" != "no" ; then
          tryctndir=$withval
      fi ]
@@ -237,6 +246,18 @@ else
   fi
 fi
 
+dnl Set CPU
+AC_MSG_CHECKING([for CPU specification])
+AC_ARG_WITH(mcpu,
+[  --with-mcpu[=CPU]         Set name of CPU for gcc -mcpu])
+
+if test "$withval" == "no" -o "$withval" == "yes" -o "$withval" == ""; then
+  AC_MSG_RESULT([no])
+else
+  AC_MSG_RESULT([$withval])
+  CFLAGS="$CFLAGS -mcpu=$withval"
+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 ], 
@@ -286,17 +307,6 @@ fi
 
 AM_CONDITIONAL(USE_LAM, test -n "$lamdir")
 
-dnl Prepare to support X.  If the user gave the command-line option
-dnl --without-x, AC_PATH_XTRA will set no_x to "yes".  Otherwise, it will
-dnl add appropriate preprocessor flags to X_CFLAGS, and appropriate linker
-dnl flags to X_LIBS.  It also checks for system-specific X libraries, and
-dnl adds them to X_PRE_LIBS or X_EXTRA_LIBS, as appropriate.  (The former
-dnl is where "-lSM -lICE" goes, in X11R6.)  We define the X_TOOLKIT_LIBS
-dnl and X_BASIC_LIBS argument vectors ourselves, and if X is to be
-dnl supported, we'll concatenate the whole lot of these into a command line
-dnl for libtool.  See, e.g., the libplot_la_LIBADD line in
-dnl libplot/Makefile.am.
-
 AC_PATH_XTRA
 AC_SUBST(X_CFLAGS)
 dnl Following five are concatenated together into a linker specification.
@@ -306,19 +316,9 @@ AC_SUBST(X_PRE_LIBS)
 AC_SUBST(X_BASIC_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
 
-X_TOOLKIT_LIBS="-lXt"
-X_BASIC_LIBS="-lXext -lX11 -lXmu"
-
-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,1,[x thread supported]), , $X_PRE_LIBS $X_BASIC_LIBS $X_EXTRA_LIBS)
-LDFLAGS="$our_saved_LDFLAGS"
-
 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")
+AM_CONDITIONAL(NO_X, test "x$with_x" = "xno")
 
 my_includes="$my_includes -I../include -I.. -I/usr/local/include"
 AC_SUBST(my_includes)
@@ -326,26 +326,33 @@ AC_SUBST(my_includes)
 LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 AC_MSG_CHECKING([for X])
-if test "$no_x" != "yes" ; then
+if test "$with_x" != "no" && test "$wxwin" = "true"; then
   AC_DEFINE(HAVE_X11,1,[X11 system])
-  LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
+  LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib -L/usr/X11R6/lib64"
+  my_includes="$my_includes -I/usr/X11R6/include"
   ctlib_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
   ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
   if test "$libgl" = "true" ; then
-    ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU"
+    # Removed "-lglut" for Mac OS X compilation
+    ctlib_graphics="$ctlib_graphics -lGL -lGLU"
     if test "$wxwin" = "true" ; then
-      ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.2"
+      if [ "$wx_gtk" ]; then 
+        ctlib_graphics="$ctlib_graphics `wx-config --libs` -lwx_gtk_gl-2.4 `gtk-config --libs` `glib-config --libs glib gmodule gthread`"
+      elif [ "$wx_mac" ]; then
+        ctlib_graphics="$ctlib_graphics -lwx_mac_gl-2.4"
+      fi
     fi
   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
 
+AM_CONDITIONAL(HAVE_SGP, test "$wxwin" = "true")
+
 if test "$png" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lpng"
 fi
@@ -353,7 +360,7 @@ if test "$zlib" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lz"
 fi
 if test "$fftw" = "true" ; then
-  ctlibs_tools="$ctlibs_tools -lrfftw -lfftw"
+  ctlibs_tools="$ctlibs_tools -lfftw3"
 fi
 if test "$ctn" = "true"; then
   ctlibs_tools="$ctlibs_tools -lctn"
@@ -406,19 +413,19 @@ if test "$efence" = "true" -a "$useefence" = "true" ; then
 fi
 
 if test "$wxwin" = "true" ; then
-  if test "$wx_gtk" = "true" ; then	
+  if [ "$wx_gtk" = "true" ] || [ "$wx_mac" == "true" ] ; then	
     wxcflags=`$wxconfig --cflags`
     wxlibs=`$wxconfig --libs`
   else
 	wxcflags="-D__WXMSW__ -D__WIN32__ -D__GNUWIN32__"
-   wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
+        wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
   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)
+AM_CONDITIONAL(HAVE_WXWINDOWS, test "$wxwin"="true")
 
 dnl Setting projet libraries and includes
 LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" 
@@ -434,5 +441,6 @@ fi
 
 CXXFLAGS="$CFLAGS"
 
-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_CONFIG_FILES([Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/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