]>
Commit | Line | Data |
---|---|---|
12d2ebf2 | 1 | diff -Nur xchm-0.6.1.org/configure.in xchm-0.6.1/configure.in |
2 | --- xchm-0.6.1.org/configure.in 2003-08-09 15:44:29.000000000 +0000 | |
3 | +++ xchm-0.6.1/configure.in 2003-08-10 12:49:30.000000000 +0000 | |
643c0d3b JB |
4 | @@ -2,18 +2,23 @@ |
5 | AC_INIT(src/chmfile.cpp) | |
6 | AM_CONFIG_HEADER(config.h) | |
7 | ||
12d2ebf2 | 8 | -CXXFLAGS="-W -Wall" |
643c0d3b JB |
9 | +CXXFLAGS="$CXXFLAGS -W -Wall" |
10 | + | |
11 | +AC_CHECK_PROG(WXCFG, wx-config, wx-config, no) | |
12 | +if test "x$WXCFG" == "xno"; then | |
13 | + AC_MSG_ERROR([wx-config not found in PATH. Do you have wxWindows installed?]) | |
14 | +fi | |
15 | +AC_SUBST(WXCFG) | |
16 | ||
17 | AC_ARG_ENABLE(static, | |
18 | [ --enable-static link statically to wxWindows.], | |
19 | - LINKOPT="`wx-config --static --libs`", | |
20 | - LINKOPT="`wx-config --libs`") | |
21 | + LINKOPT="`$WXCFG --static --libs`", | |
22 | + LINKOPT="`$WXCFG --libs`") | |
23 | AC_SUBST(LINKOPT) | |
24 | ||
25 | AC_ARG_ENABLE(debug, | |
26 | [ --enable-debug compile with gdb debug information.], | |
27 | - CXXFLAGS="$CXXFLAGS -g", | |
28 | - CXXFLAGS="$CXXFLAGS -O2") | |
29 | + CXXFLAGS="$CXXFLAGS -g") | |
30 | ||
12d2ebf2 | 31 | AM_INIT_AUTOMAKE(xchm, 0.6.1) |
643c0d3b | 32 | AC_PROG_CXX |
12d2ebf2 | 33 | @@ -25,11 +30,5 @@ |
643c0d3b JB |
34 | AC_MSG_ERROR([Can't find/use -lchm. Please install CHMLIB first.]) |
35 | ) | |
36 | ||
37 | -AC_CHECK_PROG(WXCFG, wx-config, wx-config, no) | |
38 | -if test "x$WXCFG" == "xno"; then | |
39 | - AC_MSG_ERROR([wx-config not found in PATH. Do you have wxWindows installed?]) | |
40 | -fi | |
41 | - | |
12d2ebf2 | 42 | - |
643c0d3b JB |
43 | AC_OUTPUT(Makefile src/Makefile) |
44 | ||
12d2ebf2 | 45 | diff -Nur xchm-0.6.1.org/src/Makefile.am xchm-0.6.1/src/Makefile.am |
46 | --- xchm-0.6.1.org/src/Makefile.am 2003-08-06 00:01:53.000000000 +0000 | |
47 | +++ xchm-0.6.1/src/Makefile.am 2003-08-10 12:50:21.000000000 +0000 | |
643c0d3b JB |
48 | @@ -1,4 +1,4 @@ |
49 | -INCLUDES = -I$(top_srcdir)/art `wx-config --cppflags` | |
50 | +INCLUDES = -I$(top_srcdir)/art `$(WXCFG) --cppflags` | |
51 | ||
52 | bin_PROGRAMS = xchm | |
53 | xchm_SOURCES = chmapp.cpp chmfile.cpp chmframe.cpp chmfshandler.cpp \ |