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
|
Fixing build with --as-needed
https://bugs.gentoo.org/show_bug.cgi?id=248548
--- configure.in
+++ configure.in
@@ -5,38 +5,25 @@
AC_PREFIX_DEFAULT(/usr/local)
-
-
AC_CHECK_PROGS(regex_cmd, sed)
if test x$regex_cmd = "x"; then
AC_MSG_ERROR([error. sed is required to build the default bbtoolsrc file.])
fi
-
-dnl get the debug values right
-AC_DEFUN(AC_SET_DEBUG,
-[
- test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG"
- test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
- test "$LDFLAGS" = "" && LDFLAGS=""
-])
-
-AC_DEFUN(AC_SET_NODEBUG,
-[
- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
- test "$LDFLAGS" = "" && LDFLAGS="-s"
-])
-
-
+dnl Check for debug
+DEBUG=""
+AC_MSG_CHECKING([whether to enable debug code])
AC_ARG_ENABLE(debug,[ --enable-debug create debugging code [default=no]],
-[
-if test $enableval = "no";
- then AC_SET_NODEBUG
- else AC_SET_DEBUG
-fi
-],
-AC_SET_NODEBUG)
+ if test x$enableval = "xyes"; then
+ AC_MSG_RESULT([yes])
+ DEBUG="-DDEBUG"
+ else
+ AC_MSG_RESULT([no])
+ fi,
+ AC_MSG_RESULT([no])
+ DEBUG=""
+)
+AC_SUBST(DEBUG)
dnl Check for Interlacing
INTERLACE=""
@@ -69,15 +56,8 @@
AC_PATH_X
AC_PATH_XTRA
-CFLAGS="$CFLAGS $X_CFLAGS"
-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
-
dnl Checks for X libraries.
-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
- AC_MSG_ERROR(XOpenDisplay not found in -lX11))
-
-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
+AC_CHECK_LIB(X11, XOpenDisplay,,AC_MSG_ERROR(XOpenDisplay not found in -lX11))
dnl Checks for header files.
AC_HEADER_STDC
--- Makefile.am
+++ Makefile.am
@@ -1,4 +1,4 @@
-CPPFLAGS = @CPPFLAGS@ @INTERLACE@ \
+AM_CPPFLAGS = @DEBUG@ @INTERLACE@ \
-DGLOBAL_BB=\"$(datadir)/bbtools/bbappconf.bb\" \
-DGLOBAL_NOBB=\"$(datadir)/bbtools/bbappconf.nobb\"
@@ -18,4 +18,4 @@
NETInterface.cc NETInterface.hh \
blackboxstyle.hh
EXTRA_DIST = BUGS TODO
-bbappconf_LDADD = @X_LIBS@
+bbappconf_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
|
GitWeb