blob: 92b9a3ed58ac4726a327c6e1d6e4ba680a05cb71 (
plain)
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
|
configure.ac | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index 90e612b..5a00d15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,17 +9,10 @@ AC_PROG_INSTALL
AC_STDC_HEADERS
is_static=0
-case ${prefix} in
- NONE);;
- *) is_static=1
- AC_MSG_WARN([Library libglut will be statically linked.])
- LDFLAGS="-L${prefix}/lib"
- CPPFLAGS="-I${prefix}/include";;
-esac
# set CFLAGS and LDFLAGS
-true_CFLAGS="-g -O2 -Wall -W -DMAQ_LONGREADS"
+true_CFLAGS="-DMAQ_LONGREADS"
case "${host_os}" in
darwin*)
GLLIBS="-framework OpenGL -framework GLUT"
@@ -30,17 +23,12 @@ case "${host_os}" in
i?86) CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64";;
esac
AC_CHECK_LIB([glut], [glutMouseWheelFunc], [CPPFLAGS="$CPPFLAGS -DHAVE_FREEGLUT"])
- AC_ARG_ENABLE(static, [ --enable-static statically link GLUT (Linux Only)],
- [is_static=1])
- case $is_static in
- 1) GLLIBS="-Wl,-Bstatic -lglut -Wl,-Bdynamic -lGL -lGLU -lm";;
- 0) GLLIBS="-lGL -lglut -lm";;
- esac
+ GLLIBS="-lGL -lglut -lm -lGLU"
AC_SUBST([GLLIBS]);;
# *) AC_MSG_ERROR([OS is not supported]);;
esac
AM_CONDITIONAL([HAVE_GL], [test "$isgl" = 1])
-CFLAGS=$true_CFLAGS
+CFLAGS="${CFLAGS} $true_CFLAGS"
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
|
GitWeb
