r198: *** empty log message ***

[ctsim.git] / configure.in

diff --git a/configure.in b/configure.in
index 32d3d707435e56a80a8644f8e2146ff621a9c035..b6df487ccd35eb51aa82c7c25e5015082670419f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,9 @@ AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
+
+CFLAGS="$CFLAGS -I/usr/local/include"
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
 AC_PROG_CC
 AC_PROG_CXX
 AC_PATH_PROG(wxconfig,wx-config)
@@ -79,12 +82,12 @@ AC_CHECK_LIB(ncurses, main, [ncurses=true], [ncurses=false])
 AC_CHECK_LIB(g2, main, [g2=true], [g2=false])
 wxwin=false
 AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
-AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
+AC_CHECK_LIB(wx, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
 AC_CHECK_LIB(hdf5, main, [hdf5=true], [hdf5=false], -lz)
 AC_CHECK_LIB(fftw, fftw_one, [fttw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
 
 if test "$zlib" = "true" ; then
-  AC_CHECK_LIB(png, png_check_sig, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
+  AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
 fi
 
 dnl Checks for header files.
@@ -111,8 +114,9 @@ if test "${OSTYPE}" = "cygwin" ; then
 else
   AC_CHECK_FUNC(getopt_long, [ getopt_long=true ], [ getopt_long=false ])
 fi
+
 if test "${getopt_long}" = "false" ; then
-  my_includes="$myincludes -I../getopt"
+  my_includes="$my_includes -I../getopt"
   AC_DEFINE(HAVE_GETOPT_LONG)
   ctlibs_base="$ctlibs_base -lgetopt"
   LDFLAGS="$LDFLAGS -L../getopt"
@@ -310,14 +314,16 @@ 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")
 
-my_includes="$my_includes -I../include -I.."
+my_includes="$my_includes -I../include -I.. -I/usr/local/include"
 AC_SUBST(my_includes)
 
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
+
 AC_MSG_CHECKING([for X])
 if test "$no_x" != "yes" ; then
-  AC_DEFINE(HAVE_X11)
   AC_DEFINE(HAVE_SGP)
   AM_CONDITIONAL(HAVE_SGP, test 1==1)
+  AC_DEFINE(HAVE_X11)
   LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
   ctlibs_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
@@ -327,6 +333,10 @@ if test "$no_x" != "yes" ; then
   fi   
   ctlibs_graphics="$ctlibs_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
 else
+  if test "$wxwin" = "true" ; then
+    AC_DEFINE(HAVE_SGP)
+    AM_CONDITIONAL(HAVE_SGP, test 1==1)
+  fi
   AC_MSG_RESULT(no)
 fi
 
@@ -364,9 +374,14 @@ if test "$dmallocxx" = "true" -a "$usedmalloc" = "true" ; then
 fi
 
 if test "$wxwin" = "true" ; then
-  wxcflags=`$wxconfig --cflags`
+  if test "$wx_gtk" = "true" ; then    
+    wxcflags=`$wxconfig --cflags`
+    wxlibs=`$wxconfig --libs`
+  else
+       wxcflags="-D__WXMSW__ -D__WIN32__ -D__GNUWIN32__"
+   wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
+  fi
   CFLAGS="$CFLAGS -I../include $wxcflags"
-  wxlibs=`$wxconfig --libs`
   ctlibs_graphics="$ctlibs_graphics $wxlibs"
   AM_CONDITIONAL(HAVE_WXWINDOWS, test 1==1 )
 fi