diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-02-23 19:41:52 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2018-02-23 19:41:52 +0000 |
| commit | 7d1488507d110e567f57610894e9ce5d0eaebf2b (patch) | |
| tree | 39ec070c7b17850b61f3a665f5190f5b9b55a4e2 /configure.ac | |
| parent | a0863e393af4231c93f917c18ef6b3366153c21e (diff) | |
CMake: Fix fltk-config for Windows and Unix/Linux.
This update ought to work with
fltk-config [--use-images] [--use-gl] --compile <c source file>
on both Windows and Unix/Linux when built with CMake. It was tested
under Windows and Linux using fltk-config directly from the build tree,
but it should work as well after installation.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12686 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 478a4e403..30505d4ec 100644 --- a/configure.ac +++ b/configure.ac @@ -877,10 +877,10 @@ case $host_os_gui in if test x$enable_gl != xno; then AC_CHECK_HEADER(GL/gl.h, AC_DEFINE(HAVE_GL) - GLLIB="-lopengl32") + GLLIBS="-lopengl32") AC_CHECK_HEADER(GL/glu.h, AC_DEFINE(HAVE_GL_GLU_H) - GLLIB="-lglu32 $GLLIB") + GLLIBS="-lglu32 $GLLIBS") else LINKFLTKGL="" GLLIBNAME="" @@ -918,7 +918,7 @@ case $host_os_gui in if test x$enable_gl != xno; then AC_DEFINE(HAVE_GL) AC_DEFINE(HAVE_GL_GLU_H) - GLLIB="-framework OpenGL" + GLLIBS="-framework OpenGL" else LINKFLTKGL="" GLLIBNAME="" @@ -970,17 +970,17 @@ case $host_os_gui in fi dnl Check for OpenGL unless disabled... - GLLIB= + GLLIBS= if test x$enable_gl != xno; then AC_SEARCH_LIBS(dlopen, dl) AC_CHECK_HEADER(GL/gl.h, AC_CHECK_LIB(GL, glXMakeCurrent, [AC_DEFINE(HAVE_GL) - GLLIB="-lGL"], + GLLIBS="-lGL"], AC_CHECK_LIB(MesaGL, glXMakeCurrent, [AC_DEFINE(HAVE_GL) - GLLIB="-lMesaGL"],, + GLLIBS="-lMesaGL"],, [-lm]), [-lm]) AC_CHECK_LIB(GL, glXGetProcAddressARB, @@ -989,10 +989,10 @@ case $host_os_gui in AC_CHECK_HEADER(GL/glu.h, AC_DEFINE(HAVE_GL_GLU_H) if test x$ac_cv_lib_GL_glXMakeCurrent = xyes; then - GLLIB="-lGLU $GLLIB" + GLLIBS="-lGLU $GLLIBS" fi if test x$ac_cv_lib_MesaGL_glXMakeCurrent = xyes; then - GLLIB="-lMesaGLU $GLLIB" + GLLIBS="-lMesaGLU $GLLIBS" fi ) @@ -1202,7 +1202,7 @@ case $host_os_gui in esac AC_SUBST(GLDEMOS) -AC_SUBST(GLLIB) +AC_SUBST(GLLIBS) AC_SUBST(HLINKS) AC_SUBST(OSX_ONLY) AC_SUBST(THREADS) |