Changeset 5257


Ignore:
Timestamp:
May 1, 2008, 1:29:47 PM (16 years ago)
Author:
jack
Message:

Fixed the build of anugavis to use convenience library.

Location:
anuga_work/development/anugavis
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • anuga_work/development/anugavis/configure.ac

    r5255 r5257  
    33
    44AC_PREREQ([2.56])
    5 AC_INIT([ANUGA SWW Visualiser], [alpha], [u4112456@anu.edu.au])
    6 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
    7 AC_CONFIG_SRCDIR([src/libanugavis/anugavis.h])
     5AC_INIT([ANUGA SWW Visualiser], [0.01], [u4112456@anu.edu.au])
     6AM_INIT_AUTOMAKE([foreign -Wall -Werror])
     7AC_CONFIG_SRCDIR([src/anugavis.h])
    88AC_CONFIG_HEADER([config.h])
    99
    1010# Checks for programs.
    1111AC_PROG_CC
     12AC_PROG_RANLIB
    1213
    1314# Checks for libraries.
    1415AX_CHECK_GLU
    1516AM_PATH_SDL([1.2.12], [], [AC_MSG_ERROR([SDL is required to build.])])
    16 AC_CACHE_CHECK([for SDL library path],
    17                [anugavis_cv_LIB_SDLPATH],
    18                [anugavis_cv_LIB_SDLPATH=""
    19                 for token in `sdl-config --libs`; do
    20                   case $token in
    21                   -L*)
    22                     anugavis_cv_LIB_SDLPATH="$anugavis_cv_LIB_SDLPATH $token" ;;
    23                   esac
    24                 done])
    25 SDL_LIBPATH="$anugavis_cv_LIB_SDLPATH"
    2617AC_SUBST([SDL_LIBPATH])
    2718AC_SEARCH_LIBS([nc_open], [netcdf], [],
     
    3526
    3627# Checks for library functions.
     28AC_FUNC_MALLOC
    3729
    3830AC_CONFIG_FILES([Makefile
    3931                 m4/Makefile
    40                  src/Makefile
    41                  src/anugavis_simple/Makefile
    42                  src/libanugavis/Makefile])
     32                 src/Makefile])
    4333AC_OUTPUT
  • anuga_work/development/anugavis/src/Makefile.am

    r5255 r5257  
    1111                        height_quantity.h \
    1212                        init.c
     13libanugavis_a_CFLAGS = @SDL_CFLAGS@ @GLU_CFLAGS@
     14libanugavis_a_LIBADD = @LIBOBJS@
    1315
    1416bin_PROGRAMS = anugavis_simple
    1517anugavis_simple_SOURCES = anugavis_simple.c
    1618anugavis_simple_CFLAGS = @SDL_CFLAGS@ @GLU_CFLAGS@
    17 anugavis_simple_LDADD = @SDL_LIBS@ @GLU_LIBS@
     19anugavis_simple_LDADD = -L. -lanugavis @SDL_LIBS@ @GLU_LIBS@
Note: See TracChangeset for help on using the changeset viewer.