X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=2e3cc40ffe46f4524c4ce9f90dd90a2df275034c;hp=d2167b9dde7f6b539c5767b7bdb48012dce7c6cb;hb=92a7e95f339442d5d87f0febcae338306e1c6edd;hpb=653efeb6041650df3f11b525af7b0b943b5e5f58 diff --git a/configure.in b/configure.in index d2167b9..2e3cc40 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout dnl CDPATH= AC_INIT(src/ctrec.c) -AM_INIT_AUTOMAKE(ctsim,0.5.2-b5) +AM_INIT_AUTOMAKE(ctsim,0.6.0-b1) AM_CONFIG_HEADER(config.h) dnl Checks for programs. @@ -15,22 +15,77 @@ AC_PROG_RANLIB AC_PROG_CC AC_PROG_CXX -dnl Checks for libraries. -AC_CHECK_LIB(z, main, -[ - zlib="true" -], -[ - zlib="false" - AC_MSG_WARN([zlib missing. Will need zlib for PNG support]) + +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 +AC_CHECK_SIZEOF(short, 2) +AC_CHECK_SIZEOF(int, 4) +AC_CHECK_SIZEOF(long, 4) +AC_CHECK_SIZEOF(float, 4) +AC_CHECK_SIZEOF(double, 8) + +dnl --------------------------------------------------------------------------- +dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling +dnl from wxGTK (www.wxwindows.org) - LGPL license +dnl --------------------------------------------------------------------------- + +AC_DEFUN(WX_C_BIGENDIAN, +[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian, +[ac_cv_c_bigendian=unknown +# See if sys/param.h defines the BYTE_ORDER macro. +AC_TRY_COMPILE([#include +#include ], [ +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN + bogus endian macros +#endif], [# It does; now see whether it defined to BIG_ENDIAN or not. +AC_TRY_COMPILE([#include +#include ], [ +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)]) +if test $ac_cv_c_bigendian = unknown; then +AC_TRY_RUN([main () { + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long l; + char c[sizeof (long)]; + } u; + u.l = 1; + exit (u.c[sizeof (long) - 1] == 1); +}], ac_cv_c_bigendian=no, ac_cv_c_bigendian=yes, ac_cv_c_bigendian=unknown) +fi]) +if test $ac_cv_c_bigendian = unknown; then + AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" +to config.cache file]) +fi +if test $ac_cv_c_bigendian = yes; then + AC_DEFINE(WORDS_BIGENDIAN) +fi ]) + +WX_C_BIGENDIAN + + +dnl Checks for libraries. +AC_CHECK_LIB(z, main, [ zlib="true" ], [ zlib="false" ; AC_MSG_WARN([zlib missing. Will need zlib for PNG support])]) AC_CHECK_LIB(m, main) AC_CHECK_LIB(curses, main, [curses=true], [curses=false]) AC_CHECK_LIB(ncurses, main, [ncurses=true], [ncurses=false]) - +AC_CHECK_LIB(g2, main, [g2=true], [g2=false]) +if test "$zlib" = "true" ; then + AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false]) +fi +AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true], [wxwin=false]) +AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true], [wxwin=false]) + dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h) +AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -40,21 +95,21 @@ AC_STRUCT_TM dnl Checks for library functions. AC_FUNC_VPRINTF -AC_CHECK_FUNCS(strtod strtol) +AC_CHECK_FUNCS(strtod strtol snprintf htonl) AC_CHECK_FUNC(basename) AC_CHECK_FUNC(setjmp) -AC_CHECK_FUNC(getopt_long, -[ - getopt_long=true -], -[ +if test "${OSTYPE}" = "cygwin" ; then getopt_long=false +else + AC_CHECK_FUNC(getopt_long, [ getopt_long=true ], [ getopt_long=false ]) +fi +if test "${getopt_long}" = "false" ; then my_includes="$myincludes -I../getopt" AC_DEFINE(HAVE_GETOPT_LONG) ctlibs_base="$ctlibs_base -lgetopt" LDFLAGS="$LDFLAGS -L../getopt" AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1) -]) +fi AC_ADD_GCC_CFLAGS([-Wall]) @@ -83,64 +138,17 @@ dnl Check for debug mode AC_ARG_ENABLE(debug, [ --enable-debug Turn on debugging], [case "${enableval}" in - yes) debug=true ;; - no) debug=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; + yes) debug=true + CFLAGS="$CFLAGS -g" + ;; + no) debug=false + CFLAGS="$CFLAGS -O2" + ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) + ;; esac],[debug=false]) AM_CONDITIONAL(DEBUG, test "$debug" = "true") -dnl Set PNG directory -AC_MSG_CHECKING([for PNG library installation]) -AC_ARG_WITH(png, -[ --with-png[=PATH] Set path of lib PNG installation ], -[ - if test "$withval" != "no" ; then - trypngdir=$withval - if test "$prefix" != "NONE" ; then - trypngdir="$trypngdir $prefix" - fi - fi -] -) - -if test "$withval" != "no" -a "$zlib" = "true" ; then - for testpngdir in "." $trypngdir /usr/local /usr /opt ; do - if test -f "$testpngdir/lib/libpng.a" ; then - if test ! -f "$testpngdir/include/png.h" ; then - AC_MSG_ERROR([PNG library found, but png.h not found. Check PNG installation]) - else - grep PNG_LIBPNG_VER_STRING "$testpngdir/include/png.h" | grep 9 > /dev/null - if test "$?" = "0" ; then - AC_MSG_ERROR([Your version of libpng in $testpngdir is too old -- please upgrade]) - fi - fi - LDFLAGS="$LDFLAGS -L$testpngdir/lib" - CFLAGS="$CFLAGS -I$testpngdir/include" - pngdir="$testpngdir" - AC_DEFINE(HAVE_PNG) - break - elif test -f "$testpngdir/libpng.a" ; then - if test ! -f "$testpngdir/png.h" ; then - AC_MSG_ERROR([PNG library found, but png.h not found. Check PNG installation]) - else - grep PNG_LIBPNG_VER_STRING "$testpngdir/png.h" | grep 9 > /dev/null - if test "$?" = "0" ; then - AC_MSG_ERROR([Your version of libpng in $testpngdir is too old -- please upgrade]) - fi - fi - LDFLAGS="$LDFLAGS -L$testpngdir" - CFLAGS="$CFLAGS -I$testpngdir" - pngdir="$testpngdir" - AC_DEFINE(HAVE_PNG) - break - fi - done - AC_MSG_RESULT($pngdir) - AM_CONDITIONAL(HAVE_PNG, test -n "$pngdir") -else - AC_MSG_RESULT([no]) -fi - dnl Set LAM path AC_ARG_WITH(lam, [ --with-lam[=PATH] Set path of LAM MPI ], @@ -167,6 +175,8 @@ if test "$withval" != "no" ; then fi done AC_MSG_RESULT($lamdir) +else + AC_MSG_RESULT([no]) fi AC_MSG_CHECKING([for web access]) @@ -268,11 +278,16 @@ AM_CONDITIONAL(NO_X, test "x$no_x" = "xyes") my_includes="$my_includes -I../include -I.." AC_SUBST(my_includes) -if test "x$no_x" != "xyes" ; then - AC_DEFINE(HAVE_INTERACTIVE_GRAPHICS) - AM_CONDITIONAL(HAVE_INTERACTIVE_GRAPHICS, test 1==1) - LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph" - ctlibs_base="$ctlibs_base -lezplot -lgraph" +AC_MSG_CHECKING([interactive graphics]) +if test "$no_x" != "yes" ; then + AC_DEFINE(HAVE_X11) + AC_DEFINE(HAVE_SGP) + AM_CONDITIONAL(HAVE_SGP, test 1==1) + LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph -L/usr/X11R6/lib" + ctlibs_base="$ctlibs_base -lezplot -lgraph $X_BASIC_LIBS $X_TOOLKIT_LIBS" + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) fi dnl Setting projet libraries and includes @@ -284,6 +299,13 @@ fi if test "$zlib" = "true" ; then ctlibs_base="$ctlibs_base -lz" fi +if test "$png" = "true" ; then + ctlibs_base="$ctlibs_base -lpng" +fi +if test "$g2" = "true" ; then + ctlibs_base="$ctlibs_base -lg2" +fi + ctlibs="-lir $ctlibs_base" AC_SUBST(ctlibs)