Skip to content

Commit

Permalink
make GL an explicit dep of openscenegraph, too.
Browse files Browse the repository at this point in the history
also, swap the order to have mba prefer 1.1
  • Loading branch information
novas0x2a committed Jan 20, 2009
1 parent 661b985 commit 7a3bc16
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -134,22 +134,21 @@ AX_PKG(VW_INTEREST_POINT, [BOOST], [-lvwInterestPoint])

AX_PKG(CUDA, [], [-lcuda -lcudart], [cuda.h])

AX_PKG(OPENSCENEGRAPH, [], [-losg -losgDB -lOpenThreads -losgViewer -losgText -losgGA -losgFX -losgTerrain -losgUtil], [osg/ref_ptr])

AX_PKG_ONE_OF(MBA,
MBA10, [AX_PKG(MBA10, [BOOST], [-lMBA_1.0_gpl_opt], [MBA.h])],
MBA11, [AX_PKG(MBA11, [BOOST], [-lMBA-1.1], [MBA.h])])


AX_PKG(SPICE, [], [-lcspice], [SpiceUsr.h SpiceZfc.h])

AX_PKG_ONE_OF(GL,
APPLE_GL,
[AX_PKG_APPLE([GL], [], [-framework OpenGL -framework GLUT -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib])],
LINUX_GL,
[AX_PKG(X11, [], [-lXext -lX11 -lXmu -lXi -lXt], [])
AX_PKG(LINUX_GL, [X11], [-lGL -lGLU -lglut], [GL/gl.h GL/glu.h GL/glut.h], [])])

AX_PKG(OPENSCENEGRAPH, [GL], [-losg -losgDB -lOpenThreads -losgViewer -losgText -losgGA -losgFX -losgTerrain -losgUtil], [osg/ref_ptr])

AX_PKG_ONE_OF(MBA,
MBA11, [AX_PKG(MBA11, [BOOST], [-lMBA-1.1], [MBA.h])],
MBA10, [AX_PKG(MBA10, [BOOST], [-lMBA_1.0_gpl_opt], [MBA.h])])

AX_PKG(SPICE, [], [-lcspice], [SpiceUsr.h SpiceZfc.h])

# Qt with AutoTroll.
AT_WITH_QT([+gui +sql +opengl], [], [], [], [HAVE_PKG_QT_INCLUDE=no])

Expand Down

0 comments on commit 7a3bc16

Please sign in to comment.