1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
diff --git a/configure.ac b/configure.ac
index ef3f90f..abec341 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,24 +7,24 @@ dnl AC_REVISION
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
-LIBGL=
+GLU_LIBS=
HOST=
case "${host}" in
*msvc*)
HOST=MSW
- LIBGL="-lopengl32 -lglu32"
+ GLU_LIBS="-lopengl32 -lglu32"
;;
*darwin*)
HOST=OSX
- LIBGL="-framework OpenGL"
+ GLU_LIBS="-framework OpenGL"
;;
*)
HOST=LINUX
- LIBGL="-lGL -lGLU"
+ PKG_CHECK_MODULES([GLU], [glu], [], [GLU_LIBS="-lGL -lGLU"])
;;
esac
AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW])
-AC_SUBST([LIBGL])
+AC_SUBST([GLU_LIBS])
#
# There isn't a reliable way to know we should use the Apple OpenGL framework
@@ -53,30 +53,37 @@ AC_ARG_WITH(ming,
using the ming library; (default=yes)]],
[],
[with_ming=yes])
-LIBMING=
+
+MING_LIBS=
+
AS_IF([test "x$with_ming" != xno],
[AC_CHECK_LIB([ming], [Ming_init],
- [AC_SUBST([LIBMING], ["-lming"]) AC_DEFINE([HAVE_LIBMING])],
+ [PKG_CHECK_MODULES([MING], [libming], [], [MING_LIBS="-lming"])
+ AC_DEFINE([HAVE_LIBMING])],
[if test "x$with_ming" != xyes ; then
AC_MSG_FAILURE([--with-ming was given, but test for ming failed])
fi], -lpng)])
+AC_SUBST([MING_LIBS])
+
AC_ARG_WITH(glew,
[[ --with-glew Use the system provided glew library instead of
the built-in version; (default=yes if present)]],
[],
[with_glew=check])
-LIBGLEW=
+GLEW_LIBS=
AS_IF([test "x$with_glew" != xno],
[AC_CHECK_LIB([GLEW], [glewInit],
- [AC_SUBST([LIBGLEW], ["-lGLEW"]) AC_DEFINE([SYSTEM_GLEW])],
+ [PKG_CHECK_MODULES([GLEW], [glew], [], [GLEW_LIBS="-lGLEW"])
+ AC_DEFINE([SYSTEM_GLEW])],
[if test "x$with_glew" = xyes; then
AC_MSG_FAILURE([--with-glew was given, but test for glew failed])
fi])])
-AM_CONDITIONAL([SYSTEM_GLEW], [test $LIBGLEW = "-lGLEW"])
+AM_CONDITIONAL([SYSTEM_GLEW], [test "x$ac_cv_lib_GLEW_glewInit" = xyes])
+AC_SUBST([GLEW_LIBS])
WXCONFIG=wx-config
AC_ARG_WITH(wx-config,
diff --git a/src/Makefile.am b/src/Makefile.am
index a666aff..0a88493 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,7 +80,7 @@ wxmacmolplt_SOURCES += glew.cpp glew.h glxew.h wglew.h
endif
AM_CXXFLAGS = $(WX_CXXFLAGS)
-wxmacmolplt_LDADD = $(WX_LIBS) $(LIBMING) $(LIBGL) $(LIBGLEW)
+wxmacmolplt_LDADD = $(WX_LIBS) $(MING_LIBS) $(GLU_LIBS) $(GLEW_LIBS)
wxmacmolplt_LDFLAGS = $(WX_CXXFLAGS)
EXTRA_DIST = wxMacMolPlt.pjd xpms/arrow.xpm \
xpms/hand.xpm xpms/rect_lasso.xpm xpms/view.xpm
|
GitWeb