Changeset 5257

Timestamp:

May 1, 2008, 1:29:47 PM (17 years ago)

Author:

jack

Message:

Fixed the build of anugavis to use convenience library.

Location:

anuga_work/development/anugavis

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)

anuga_work/development/anugavis/configure.ac

@@ -3 +3 @@
 
 AC_PREREQ([2.56])
-AC_INIT([ANUGA SWW Visualiser], [alpha], [u4112456@anu.edu.au])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-AC_CONFIG_SRCDIR([src/libanugavis/anugavis.h])
+AC_INIT([ANUGA SWW Visualiser], [0.01], [u4112456@anu.edu.au])
+AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+AC_CONFIG_SRCDIR([src/anugavis.h])
 AC_CONFIG_HEADER([config.h])
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_RANLIB
 
 # Checks for libraries.
 AX_CHECK_GLU
 AM_PATH_SDL([1.2.12], [], [AC_MSG_ERROR([SDL is required to build.])])
-AC_CACHE_CHECK([for SDL library path],
-               [anugavis_cv_LIB_SDLPATH],
-               [anugavis_cv_LIB_SDLPATH=""
-                for token in `sdl-config --libs`; do
-                  case $token in
-                  -L*)
-                    anugavis_cv_LIB_SDLPATH="$anugavis_cv_LIB_SDLPATH $token" ;;
-                  esac
-                done])
-SDL_LIBPATH="$anugavis_cv_LIB_SDLPATH"
 AC_SUBST([SDL_LIBPATH])
 AC_SEARCH_LIBS([nc_open], [netcdf], [],
@@ -35 +26 @@
 
 # Checks for library functions.
+AC_FUNC_MALLOC
 
 AC_CONFIG_FILES([Makefile
                  m4/Makefile
-                 src/Makefile
-                 src/anugavis_simple/Makefile
-                 src/libanugavis/Makefile])
+                 src/Makefile])
 AC_OUTPUT

anuga_work/development/anugavis/src/Makefile.am

@@ -11 +11 @@
                         height_quantity.h \
                         init.c
+libanugavis_a_CFLAGS = @SDL_CFLAGS@ @GLU_CFLAGS@
+libanugavis_a_LIBADD = @LIBOBJS@
 
 bin_PROGRAMS = anugavis_simple
 anugavis_simple_SOURCES = anugavis_simple.c
 anugavis_simple_CFLAGS = @SDL_CFLAGS@ @GLU_CFLAGS@
-anugavis_simple_LDADD = @SDL_LIBS@ @GLU_LIBS@
+anugavis_simple_LDADD = -L. -lanugavis @SDL_LIBS@ @GLU_LIBS@