]>
Commit | Line | Data |
---|---|---|
9ddb814d PG |
1 | --- ./configure.in.org Thu Aug 8 19:37:38 2002 |
2 | +++ ./configure.in Thu Aug 8 19:38:02 2002 | |
3 | @@ -1,78 +0,0 @@ | |
4 | -dnl Process this file with autoconf to produce a configure script. | |
5 | -AC_INIT(3ddesk.cpp) | |
6 | -AM_INIT_AUTOMAKE(3ddesktop,0.1.5) | |
7 | - | |
8 | -dnl Checks for programs. | |
9 | -AC_PROG_CXX | |
10 | -AC_PROG_CC | |
11 | - | |
12 | -dnl Checks for header files. | |
13 | -AC_PATH_XTRA | |
14 | - | |
15 | -AC_HEADER_DIRENT | |
16 | -AC_HEADER_STDC | |
17 | -AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h) | |
18 | -dnl AC_CHECK_HEADERS(Imlib2.h) | |
19 | - | |
20 | -dnl Checks for libraries. | |
21 | -MDL_HAVE_OPENGL | |
22 | - | |
23 | -AC_CHECK_HEADERS(GL/gl.h, ,exit) | |
24 | -AC_CHECK_HEADERS(X11/extensions/xf86vmode.h, ,exit) | |
25 | - | |
26 | -dnl ---- I'll assume the header check is enough | |
27 | -dnl AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryVersion) | |
28 | -dnl AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryVersion, ,exit) | |
29 | - | |
30 | -dnl AC_CHECK_LIB(Imlib2, imlib_create_image_from_drawable) | |
31 | - | |
32 | -IMLIB2_CONFIG_IN_PATH=yes | |
33 | -AC_PROGRAM_CHECK(IMLIB2_CONFIG_IN_PATH, imlib2-config, yes, no) | |
34 | -if test $IMLIB2_CONFIG_IN_PATH = no; then | |
35 | - echo "ERROR." | |
36 | - echo "The imlib2-config development script was not found in your execute" | |
37 | - echo "path." | |
38 | - echo "You may have imlib2 installed somewhere not covered by your path." | |
39 | - echo "" | |
40 | - echo "If this is the case make sure you have the packages installed, AND" | |
41 | - echo "that the imlib2-config script is in your execute path (see your" | |
42 | - echo "shell's manual page on setting the \$PATH environment variable)." | |
43 | - AC_MSG_ERROR([Fatal Error: no imlib2-config detected.]) | |
44 | - exit; | |
45 | -fi | |
46 | -imlib2_cflags=`imlib2-config --cflags` | |
47 | -imlib2_libs=`imlib2-config --libs` | |
48 | -AC_SUBST(imlib2_cflags) | |
49 | -AC_SUBST(imlib2_libs) | |
50 | - | |
51 | - | |
52 | - | |
53 | -dnl AC_CHECK_LIB(GL, glClearColor) | |
54 | - | |
55 | -dnl AC_CHECK_LIB(GLU, gluBuild2DMipmaps) | |
56 | - | |
57 | -dnl AC_CHECK_LIB(X11, XAllowEvents) | |
58 | - | |
59 | -dnl AC_CHECK_LIB(Xi, XQueryTree) | |
60 | - | |
61 | -dnl AC_CHECK_LIB(Xmu, XInternAtom) | |
62 | - | |
63 | -dnl AC_CHECK_LIB(glut, glutSwapBuffers) | |
64 | - | |
65 | -AC_CHECK_LIB(m, cos) | |
66 | - | |
67 | -dnl Checks for typedefs, structures, and compiler characteristics. | |
68 | -AC_C_INLINE | |
69 | -AC_HEADER_TIME | |
70 | - | |
71 | -dnl Checks for library functions. | |
72 | -AC_CHECK_FUNCS(gettimeofday mkdir strerror) | |
73 | - | |
74 | -AC_OUTPUT(Makefile) | |
75 | - | |
76 | -dnl AC_MSG_RESULT([ | |
77 | -dnl Using the following for compiling and linking OpenGL programs: | |
78 | -dnl | |
79 | -dnl GL_CFLAGS: $GL_CFLAGS | |
80 | -dnl GL_LIBS: $GL_LIBS | |
81 | -dnl ]) | |
82 | --- ./configure.ac.org Thu Aug 8 19:38:14 2002 | |
83 | +++ ./configure.ac Thu Aug 8 21:06:00 2002 | |
84 | @@ -0,0 +1,80 @@ | |
85 | +dnl Process this file with autoconf to produce a configure script. | |
86 | +AC_INIT([3ddesktop],[0.1.5],[your@mail.org]) | |
87 | +AC_CONFIG_SRCDIR([3ddesk.cpp]) | |
88 | +AM_INIT_AUTOMAKE | |
89 | + | |
90 | +dnl Checks for programs. | |
91 | +AC_PROG_CC | |
92 | +AC_PROG_CXX | |
93 | +AC_C_INLINE | |
94 | +AC_HEADER_TIME | |
95 | + | |
96 | +dnl Checks for header files. | |
97 | +AC_PATH_XTRA | |
98 | + | |
99 | +CPPFLAGS="-I/usr/X11R6/include" | |
100 | +AC_HEADER_DIRENT | |
101 | +AC_HEADER_STDC | |
102 | +AC_CHECK_HEADERS([fcntl.h sys/time.h unistd.h]) | |
103 | +dnl AC_CHECK_HEADERS(Imlib2.h) | |
104 | + | |
105 | +dnl Checks for libraries. | |
106 | +MDL_HAVE_OPENGL | |
107 | + | |
108 | +AC_CHECK_HEADERS(GL/gl.h,[ ] ,[AC_MSG_ERROR([You need gl.h in your system])]) | |
109 | +AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,[ ] ,[AC_MSG_ERROR([You need xf86vmode.h in your system])]) | |
110 | + | |
111 | +dnl ---- I'll assume the header check is enough | |
112 | +dnl AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryVersion) | |
113 | +dnl AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryVersion, ,exit) | |
114 | + | |
115 | +dnl AC_CHECK_LIB(Imlib2, imlib_create_image_from_drawable) | |
116 | +IMLIB2_CONFIG_IN_PATH=yes | |
117 | +AC_CHECK_PROG(IMLIB2_CONFIG_IN_PATH, imlib2-config, yes, no) | |
118 | +if test $IMLIB2_CONFIG_IN_PATH = no; then | |
119 | + echo "ERROR." | |
120 | + echo "The imlib2-config development script was not found in your execute" | |
121 | + echo "path." | |
122 | + echo "You may have imlib2 installed somewhere not covered by your path." | |
123 | + echo "" | |
124 | + echo "If this is the case make sure you have the packages installed, AND" | |
125 | + echo "that the imlib2-config script is in your execute path (see your" | |
126 | + echo "shell's manual page on setting the \$PATH environment variable)." | |
127 | + AC_MSG_ERROR([Fatal Error: no imlib2-config detected.]) | |
128 | + exit; | |
129 | +fi | |
130 | +imlib2_cflags=`imlib2-config --cflags` | |
131 | +imlib2_libs=`imlib2-config --libs` | |
132 | +AC_SUBST(imlib2_cflags) | |
133 | +AC_SUBST(imlib2_libs) | |
134 | + | |
135 | +#AC_CHECK_PROG(IMLIB2_CONFIG_IN_PATH, imlib2-config, | |
136 | +# CFLAGS="$CFLAGS `imlib2-config --cflags`" | |
137 | +# LIBS="$LIBS `imlib2-config --libs`", | |
138 | +# [AC_MSG_ERROR(Fatal Error: no imlib2-config detected.)]) | |
139 | + | |
140 | +dnl AC_CHECK_LIB(GL, glClearColor) | |
141 | + | |
142 | +dnl AC_CHECK_LIB(GLU, gluBuild2DMipmaps) | |
143 | + | |
144 | +dnl AC_CHECK_LIB(X11, XAllowEvents) | |
145 | + | |
146 | +dnl AC_CHECK_LIB(Xi, XQueryTree) | |
147 | + | |
148 | +dnl AC_CHECK_LIB(Xmu, XInternAtom) | |
149 | + | |
150 | +dnl AC_CHECK_LIB(glut, glutSwapBuffers) | |
151 | + | |
152 | +AC_CHECK_LIB(m, cos) | |
153 | + | |
154 | +dnl Checks for library functions. | |
155 | +AC_CHECK_FUNCS([gettimeofday mkdir strerror]) | |
156 | + | |
157 | +AC_OUTPUT([Makefile]) | |
158 | + | |
159 | +dnl AC_MSG_RESULT([ | |
160 | +dnl Using the following for compiling and linking OpenGL programs: | |
161 | +dnl | |
162 | +dnl GL_CFLAGS: $GL_CFLAGS | |
163 | +dnl GL_LIBS: $GL_LIBS | |
164 | +dnl ]) | |
165 | --- ./Makefile.in.org Thu Aug 8 21:03:17 2002 | |
166 | +++ ./Makefile.in Thu Aug 8 21:07:15 2002 | |
167 | @@ -98,13 +98,13 @@ | |
168 | ||
169 | maintainer-clean: clean | |
170 | ||
171 | -# automatic re-running of configure if the configure.in file has changed | |
172 | -${srcdir}/configure: configure.in aclocal.m4 | |
173 | +# automatic re-running of configure if the configure.ac file has changed | |
174 | +${srcdir}/configure: configure.ac aclocal.m4 | |
175 | cd ${srcdir} && autoconf | |
176 | ||
177 | # autoheader might not change config.h.in, so touch a stamp file | |
178 | ${srcdir}/config.h.in: stamp-h.in | |
179 | -${srcdir}/stamp-h.in: configure.in #aclocal.m4 | |
180 | +${srcdir}/stamp-h.in: configure.ac #aclocal.m4 | |
181 | cd ${srcdir} && autoheader | |
182 | echo timestamp > ${srcdir}/stamp-h.in | |
183 |