=================================================================== RCS file: /home/cvs/OpenXM/src/oxmgraph/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- OpenXM/src/oxmgraph/configure.in 2009/02/08 04:56:59 1.1 +++ OpenXM/src/oxmgraph/configure.in 2009/03/18 02:35:00 1.2 @@ -1,28 +1,27 @@ dnl If you change this file, do not forget to run autoconf and rm .configure_done +AC_INIT +AC_PREREQ(2.61) +AC_CANONICAL_TARGET -AC_INIT(graph.c) AC_PROG_CC -AC_PROG_RANLIB +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PATH_XTRA -AC_CHECK_HEADER(GL/glut.h,AC_SUBST(MYTARGET,["oxmgraph"]),AC_SUBST(MYTARGET,[""])) -AC_CHECK_HEADER(GL/glut.h,AC_SUBST(MYTARGET2,["install2"]),AC_SUBST(MYTARGET2,[""])) - - -AC_CANONICAL_SYSTEM -case $target_os in -darwin*) - AC_SUBST(CFLAG2,["-DMAC_OS_X"]) - AC_SUBST(LFLAG2,["-framework GLUT -framework OpenGL"]) - AC_SUBST(MYTARGET,["oxmgraph"]) - AC_SUBST(MYTARGET2,["install2"]) -;; +TARGET=oxmgraph +case "${host}" in +*-apple-darwin*) + LIBS="-framework GLUT -framework OpenGL" + ;; *) - AC_SUBST(CFLAG2,[""]) - AC_SUBST(LFLAG2,["-lglut"]) -;; + CPPFLAGS="${CPPFLAGS} -I /usr/local/include" + AC_CHECK_HEADER(GL/glut.h, [], [TARGET=""]) + LIBS="-L /usr/local/lib -lglut" + ;; esac - - -AC_OUTPUT(Makefile) +AC_SUBST([TARGET]) +AC_SUBST([LIBS]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT