]>
Commit | Line | Data |
---|---|---|
41c8784a PG |
1 | --- ./src/Makefile.am.org Mon Jul 29 23:46:33 2002 |
2 | +++ ./src/Makefile.am Mon Aug 5 02:50:12 2002 | |
3 | @@ -16,9 +16,9 @@ | |
4 | DragDrop.cpp Complex_math.cpp Math_functions.cpp Modify.cpp Rational_math.cpp \ | |
5 | Real_math.cpp Vector_math.cpp Setup.cpp Prefs.cpp | |
6 | ||
7 | -MathPlanner3_LDADD = -L$(QTDIR)/lib -lqt-mt | |
8 | +MathPlanner3_LDADD = -L$(QTDIR)/lib -L$(QTDIR)/lib/qt -lqt-mt | |
9 | ||
10 | -INCLUDES = -I/usr/X11R6/include -I$(QTDIR)/include -D_GNU_SOURCE \ | |
11 | +INCLUDES = -I/usr/X11R6/include -I$(QTDIR)/include -I$(QTDIR)/include/qt -D_GNU_SOURCE \ | |
12 | -D_INSTALL_DIR=\"$(pkgdatadir)\" | |
13 | ||
14 | ||
15 | --- ./configure.in.org Tue Jul 30 14:32:32 2002 | |
16 | +++ ./configure.in Mon Aug 5 02:51:23 2002 | |
17 | @@ -1,26 +1,23 @@ | |
18 | # Process this file with autoconf to produce a configure script. | |
19 | -AC_INIT(src/Base.cpp) | |
20 | -AM_CONFIG_HEADER(config.h) | |
21 | - | |
22 | -PACKAGE=MathPlanner3 | |
23 | -VERSION=3.0.3 | |
24 | -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) | |
25 | +AC_INIT([MathPlanner], [3.0.3], [modem626@kymp.net]) | |
26 | +AC_CONFIG_SRCDIR([src/Base.cpp]) | |
27 | +AM_CONFIG_HEADER([config.h]) | |
28 | +AM_INIT_AUTOMAKE | |
29 | ||
30 | # Checks for programs. | |
31 | AC_PROG_CC | |
32 | AC_PROG_CXX | |
33 | +AC_PROG_INSTALL | |
34 | +AM_PROG_LIBTOOL | |
35 | AC_CHECK_PROG(WEB_BROWSER, mozilla, "mozilla") | |
36 | AC_CHECK_PROG(WEB_BROWSER, quanta, "quanta") | |
37 | ||
38 | - | |
39 | - | |
40 | - | |
41 | # Checks for header files. | |
42 | AC_HEADER_STDC | |
43 | -AC_CHECK_HEADERS(string.h,,AC_MSG_ERROR(You must have string.h)) | |
44 | +AC_CHECK_HEADERS(string.h,,AC_MSG_ERROR([You must have string.h])) | |
45 | ||
46 | # Checks for library functions. | |
47 | -AC_CHECK_FUNCS(memset memcpy) | |
48 | +AC_CHECK_FUNCS([memset memcpy]) | |
49 | ||
50 | # checks for libraries | |
51 | ||
52 | @@ -28,8 +25,13 @@ | |
53 | # do nothing | |
54 | HAVE_QT=1 | |
55 | else | |
56 | - AC_MSG_ERROR(You must export QTDIR) | |
57 | + AC_MSG_ERROR([You must export QTDIR]) | |
58 | fi | |
59 | ||
60 | # All done | |
61 | -AC_OUTPUT(Makefile src/Makefile Doc/Makefile examples/Makefile icons/Makefile pixmaps/Makefile) | |
62 | +AC_OUTPUT([Makefile | |
63 | + src/Makefile | |
64 | + Doc/Makefile | |
65 | + examples/Makefile | |
66 | + icons/Makefile | |
67 | + pixmaps/Makefile]) | |
68 | --- ./Makefile.am.org Sun Aug 4 16:20:45 2002 | |
69 | +++ ./Makefile.am Mon Aug 5 02:48:35 2002 | |
70 | @@ -11,6 +11,7 @@ | |
71 | ||
72 | EXTRA_DIST = ChangeLog COPYING MPLConfig.txt Doc.htm | |
73 | ||
74 | +AUTOMAKE_OPTIONS=foreign dist-bzip2 | |
75 | ||
76 | install-data-local: $(EXTRA_DIST) | |
77 | @$(NORMAL_INSTALL) |