source: trunk/dports/graphics/ftgl/files/patch-unix-configure @ 21483

Last change on this file since 21483 was 21483, checked in by eridius@…, 13 years ago

Massive update to svn properties on files:
All patchfiles have svn:eol-style removed.
All files that are not in fact able to be executed have svn:executable removed
All binary files have svn:eol-style removed (and are probably corrupt)
All binary files have svn:mime-type set to application/octet-stream
All files which are not patchfiles or binary files have svn:eol-style set to native
All Portfiles have svn:eol-style set to native and svn:executable removed

File size: 16.5 KB
Line 
1--- unix/configure      Mon Aug 25 06:18:22 2003
2+++ ../../FTGL/unix/configure   Sun Feb  8 18:43:43 2004
3@@ -1032,9 +1032,9 @@
4   --with-x                use the X Window System
5   --with-ft-prefix=PFX      Prefix where FreeType is installed (optional)
6   --with-ft-exec-prefix=PFX Exec prefix where FreeType is installed (optional)
7-  --with-gl-inc=DIR       Directory where GL/gl.h is installed
8+  --with-gl-inc=DIR       Directory where OpenGL/gl.h is installed
9   --with-gl-lib=DIR       Directory where OpenGL libraries are installed
10-  --with-glut-inc=DIR     Directory where GL/glut.h is installed (optional)
11+  --with-glut-inc=DIR     Directory where GLUT/glut.h is installed (optional)
12   --with-glut-lib=DIR     Directory where GLUT libraries are installed
13                           (optional)
14 
15@@ -9342,8 +9342,8 @@
16 
17 CPPFLAGS="$GL_CFLAGS"
18 if test "${ac_cv_header_GL_gl_h+set}" = set; then
19-  echo "$as_me:$LINENO: checking for GL/gl.h" >&5
20-echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6
21+  echo "$as_me:$LINENO: checking for OpenGL/gl.h" >&5
22+echo $ECHO_N "checking for OpenGL/gl.h... $ECHO_C" >&6
23 if test "${ac_cv_header_GL_gl_h+set}" = set; then
24   echo $ECHO_N "(cached) $ECHO_C" >&6
25 fi
26@@ -9351,8 +9351,8 @@
27 echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6
28 else
29   # Is the header compilable?
30-echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
31-echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6
32+echo "$as_me:$LINENO: checking OpenGL/gl.h usability" >&5
33+echo $ECHO_N "checking OpenGL/gl.h usability... $ECHO_C" >&6
34 cat >conftest.$ac_ext <<_ACEOF
35 #line $LINENO "configure"
36 /* confdefs.h.  */
37@@ -9361,7 +9361,7 @@
38 cat >>conftest.$ac_ext <<_ACEOF
39 /* end confdefs.h.  */
40 $ac_includes_default
41-#include <GL/gl.h>
42+#include <OpenGL/gl.h>
43 _ACEOF
44 rm -f conftest.$ac_objext
45 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
46@@ -9387,8 +9387,8 @@
47 echo "${ECHO_T}$ac_header_compiler" >&6
48 
49 # Is the header present?
50-echo "$as_me:$LINENO: checking GL/gl.h presence" >&5
51-echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6
52+echo "$as_me:$LINENO: checking OpenGL/gl.h presence" >&5
53+echo $ECHO_N "checking OpenGL/gl.h presence... $ECHO_C" >&6
54 cat >conftest.$ac_ext <<_ACEOF
55 #line $LINENO "configure"
56 /* confdefs.h.  */
57@@ -9396,7 +9396,7 @@
58 cat confdefs.h >>conftest.$ac_ext
59 cat >>conftest.$ac_ext <<_ACEOF
60 /* end confdefs.h.  */
61-#include <GL/gl.h>
62+#include <OpenGL/gl.h>
63 _ACEOF
64 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
65   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
66@@ -9429,10 +9429,10 @@
67 # So?  What about this header?
68 case $ac_header_compiler:$ac_header_preproc in
69   yes:no )
70-    { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
71-echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
72-    { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
73-echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
74+    { echo "$as_me:$LINENO: WARNING: OpenGL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
75+echo "$as_me: WARNING: OpenGL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
76+    { echo "$as_me:$LINENO: WARNING: OpenGL/gl.h: proceeding with the preprocessor's result" >&5
77+echo "$as_me: WARNING: OpenGL/gl.h: proceeding with the preprocessor's result" >&2;}
78     (
79       cat <<\_ASBOX
80 ## ------------------------------------ ##
81@@ -9443,12 +9443,12 @@
82       sed "s/^/$as_me: WARNING:     /" >&2
83     ;;
84   no:yes )
85-    { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5
86-echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}
87-    { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5
88-echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;}
89-    { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
90-echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
91+    { echo "$as_me:$LINENO: WARNING: OpenGL/gl.h: present but cannot be compiled" >&5
92+echo "$as_me: WARNING: OpenGL/gl.h: present but cannot be compiled" >&2;}
93+    { echo "$as_me:$LINENO: WARNING: OpenGL/gl.h: check for missing prerequisite headers?" >&5
94+echo "$as_me: WARNING: OpenGL/gl.h: check for missing prerequisite headers?" >&2;}
95+    { echo "$as_me:$LINENO: WARNING: OpenGL/gl.h: proceeding with the preprocessor's result" >&5
96+echo "$as_me: WARNING: OpenGL/gl.h: proceeding with the preprocessor's result" >&2;}
97     (
98       cat <<\_ASBOX
99 ## ------------------------------------ ##
100@@ -9459,8 +9459,8 @@
101       sed "s/^/$as_me: WARNING:     /" >&2
102     ;;
103 esac
104-echo "$as_me:$LINENO: checking for GL/gl.h" >&5
105-echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6
106+echo "$as_me:$LINENO: checking for OpenGL/gl.h" >&5
107+echo $ECHO_N "checking for OpenGL/gl.h... $ECHO_C" >&6
108 if test "${ac_cv_header_GL_gl_h+set}" = set; then
109   echo $ECHO_N "(cached) $ECHO_C" >&6
110 else
111@@ -9473,8 +9473,8 @@
112 if test $ac_cv_header_GL_gl_h = yes; then
113   :
114 else
115-  { { echo "$as_me:$LINENO: error: GL/gl.h is needed" >&5
116-echo "$as_me: error: GL/gl.h is needed" >&2;}
117+  { { echo "$as_me:$LINENO: error: OpenGL/gl.h is needed" >&5
118+echo "$as_me: error: OpenGL/gl.h is needed" >&2;}
119    { (exit please specify its location with --with-gl-inc.  If this still fails); exit please specify its location with --with-gl-inc.  If this still fails; }; }
120 fi
121 
122@@ -9484,12 +9484,12 @@
123 echo $ECHO_N "checking for GL library... $ECHO_C" >&6
124 if test "x$with_gl_lib" != "x" ; then
125     if test -d "$with_gl_lib" ; then
126-        LIBS="-L$with_gl_lib -lGL"
127+        LIBS="-L$with_gl_lib -framework OpenGL -lobjc"
128     else
129         LIBS="$with_gl_lib"
130     fi
131 else
132-    LIBS="-lGL"
133+    LIBS="-framework OpenGL -lobjc"
134 fi
135 cat >conftest.$ac_ext <<_ACEOF
136 #line $LINENO "configure"
137@@ -9536,7 +9536,7 @@
138 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
139 if test "x$HAVE_GL" = xno ; then
140     if test "x$GL_X_LIBS" != x ; then
141-        LIBS="-lGL $GL_X_LIBS"
142+        LIBS="-framework OpenGL -lobjc $GL_X_LIBS"
143         cat >conftest.$ac_ext <<_ACEOF
144 #line $LINENO "configure"
145 /* confdefs.h.  */
146@@ -9595,8 +9595,8 @@
147 fi
148 
149 if test "${ac_cv_header_GL_glu_h+set}" = set; then
150-  echo "$as_me:$LINENO: checking for GL/glu.h" >&5
151-echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6
152+  echo "$as_me:$LINENO: checking for OpenGL/glu.h" >&5
153+echo $ECHO_N "checking for OpenGL/glu.h... $ECHO_C" >&6
154 if test "${ac_cv_header_GL_glu_h+set}" = set; then
155   echo $ECHO_N "(cached) $ECHO_C" >&6
156 fi
157@@ -9604,8 +9604,8 @@
158 echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6
159 else
160   # Is the header compilable?
161-echo "$as_me:$LINENO: checking GL/glu.h usability" >&5
162-echo $ECHO_N "checking GL/glu.h usability... $ECHO_C" >&6
163+echo "$as_me:$LINENO: checking OpenGL/glu.h usability" >&5
164+echo $ECHO_N "checking OpenGL/glu.h usability... $ECHO_C" >&6
165 cat >conftest.$ac_ext <<_ACEOF
166 #line $LINENO "configure"
167 /* confdefs.h.  */
168@@ -9614,7 +9614,7 @@
169 cat >>conftest.$ac_ext <<_ACEOF
170 /* end confdefs.h.  */
171 $ac_includes_default
172-#include <GL/glu.h>
173+#include <OpenGL/glu.h>
174 _ACEOF
175 rm -f conftest.$ac_objext
176 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
177@@ -9640,8 +9640,8 @@
178 echo "${ECHO_T}$ac_header_compiler" >&6
179 
180 # Is the header present?
181-echo "$as_me:$LINENO: checking GL/glu.h presence" >&5
182-echo $ECHO_N "checking GL/glu.h presence... $ECHO_C" >&6
183+echo "$as_me:$LINENO: checking OpenGL/glu.h presence" >&5
184+echo $ECHO_N "checking OpenGL/glu.h presence... $ECHO_C" >&6
185 cat >conftest.$ac_ext <<_ACEOF
186 #line $LINENO "configure"
187 /* confdefs.h.  */
188@@ -9649,7 +9649,7 @@
189 cat confdefs.h >>conftest.$ac_ext
190 cat >>conftest.$ac_ext <<_ACEOF
191 /* end confdefs.h.  */
192-#include <GL/glu.h>
193+#include <OpenGL/glu.h>
194 _ACEOF
195 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
196   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
197@@ -9682,10 +9682,10 @@
198 # So?  What about this header?
199 case $ac_header_compiler:$ac_header_preproc in
200   yes:no )
201-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&5
202-echo "$as_me: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
203-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5
204-echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;}
205+    { echo "$as_me:$LINENO: WARNING: OpenGL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&5
206+echo "$as_me: WARNING: OpenGL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
207+    { echo "$as_me:$LINENO: WARNING: OpenGL/glu.h: proceeding with the preprocessor's result" >&5
208+echo "$as_me: WARNING: OpenGL/glu.h: proceeding with the preprocessor's result" >&2;}
209     (
210       cat <<\_ASBOX
211 ## ------------------------------------ ##
212@@ -9696,12 +9696,12 @@
213       sed "s/^/$as_me: WARNING:     /" >&2
214     ;;
215   no:yes )
216-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: present but cannot be compiled" >&5
217-echo "$as_me: WARNING: GL/glu.h: present but cannot be compiled" >&2;}
218-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: check for missing prerequisite headers?" >&5
219-echo "$as_me: WARNING: GL/glu.h: check for missing prerequisite headers?" >&2;}
220-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5
221-echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;}
222+    { echo "$as_me:$LINENO: WARNING: OpenGL/glu.h: present but cannot be compiled" >&5
223+echo "$as_me: WARNING: OpenGL/glu.h: present but cannot be compiled" >&2;}
224+    { echo "$as_me:$LINENO: WARNING: OpenGL/glu.h: check for missing prerequisite headers?" >&5
225+echo "$as_me: WARNING: OpenGL/glu.h: check for missing prerequisite headers?" >&2;}
226+    { echo "$as_me:$LINENO: WARNING: OpenGL/glu.h: proceeding with the preprocessor's result" >&5
227+echo "$as_me: WARNING: OpenGL/glu.h: proceeding with the preprocessor's result" >&2;}
228     (
229       cat <<\_ASBOX
230 ## ------------------------------------ ##
231@@ -9712,8 +9712,8 @@
232       sed "s/^/$as_me: WARNING:     /" >&2
233     ;;
234 esac
235-echo "$as_me:$LINENO: checking for GL/glu.h" >&5
236-echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6
237+echo "$as_me:$LINENO: checking for OpenGL/glu.h" >&5
238+echo $ECHO_N "checking for OpenGL/glu.h... $ECHO_C" >&6
239 if test "${ac_cv_header_GL_glu_h+set}" = set; then
240   echo $ECHO_N "(cached) $ECHO_C" >&6
241 else
242@@ -9734,7 +9734,7 @@
243 cat confdefs.h >>conftest.$ac_ext
244 cat >>conftest.$ac_ext <<_ACEOF
245 /* end confdefs.h.  */
246-#include <GL/glu.h>
247+#include <OpenGL/glu.h>
248 int
249 main ()
250 {
251@@ -9776,7 +9776,7 @@
252 
253 echo "$as_me:$LINENO: checking for GLU library" >&5
254 echo $ECHO_N "checking for GLU library... $ECHO_C" >&6
255-LIBS="-lGLU $GL_LIBS"
256+LIBS="-framework OpenGL -lobjc $GL_LIBS"
257 cat >conftest.$ac_ext <<_ACEOF
258 #line $LINENO "configure"
259 /* confdefs.h.  */
260@@ -9822,7 +9822,7 @@
261 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
262 if test "x$HAVE_GLU" = xno ; then
263     if test "x$GL_X_LIBS" != x ; then
264-        LIBS="-lGLU $GL_LIBS $GL_X_LIBS"
265+        LIBS="-framework OpenGL -lobjc $GL_LIBS $GL_X_LIBS"
266         cat >conftest.$ac_ext <<_ACEOF
267 #line $LINENO "configure"
268 /* confdefs.h.  */
269@@ -9936,8 +9936,8 @@
270 
271 CPPFLAGS="$GLUT_CFLAGS"
272 if test "${ac_cv_header_GL_glut_h+set}" = set; then
273-  echo "$as_me:$LINENO: checking for GL/glut.h" >&5
274-echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6
275+  echo "$as_me:$LINENO: checking for GLUT/glut.h" >&5
276+echo $ECHO_N "checking for GLUT/glut.h... $ECHO_C" >&6
277 if test "${ac_cv_header_GL_glut_h+set}" = set; then
278   echo $ECHO_N "(cached) $ECHO_C" >&6
279 fi
280@@ -9945,8 +9945,8 @@
281 echo "${ECHO_T}$ac_cv_header_GL_glut_h" >&6
282 else
283   # Is the header compilable?
284-echo "$as_me:$LINENO: checking GL/glut.h usability" >&5
285-echo $ECHO_N "checking GL/glut.h usability... $ECHO_C" >&6
286+echo "$as_me:$LINENO: checking GLUT/glut.h usability" >&5
287+echo $ECHO_N "checking GLUT/glut.h usability... $ECHO_C" >&6
288 cat >conftest.$ac_ext <<_ACEOF
289 #line $LINENO "configure"
290 /* confdefs.h.  */
291@@ -9955,7 +9955,7 @@
292 cat >>conftest.$ac_ext <<_ACEOF
293 /* end confdefs.h.  */
294 $ac_includes_default
295-#include <GL/glut.h>
296+#include <GLUT/glut.h>
297 _ACEOF
298 rm -f conftest.$ac_objext
299 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
300@@ -9981,8 +9981,8 @@
301 echo "${ECHO_T}$ac_header_compiler" >&6
302 
303 # Is the header present?
304-echo "$as_me:$LINENO: checking GL/glut.h presence" >&5
305-echo $ECHO_N "checking GL/glut.h presence... $ECHO_C" >&6
306+echo "$as_me:$LINENO: checking GLUT/glut.h presence" >&5
307+echo $ECHO_N "checking GLUT/glut.h presence... $ECHO_C" >&6
308 cat >conftest.$ac_ext <<_ACEOF
309 #line $LINENO "configure"
310 /* confdefs.h.  */
311@@ -9990,7 +9990,7 @@
312 cat confdefs.h >>conftest.$ac_ext
313 cat >>conftest.$ac_ext <<_ACEOF
314 /* end confdefs.h.  */
315-#include <GL/glut.h>
316+#include <GLUT/glut.h>
317 _ACEOF
318 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
319   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
320@@ -10023,10 +10023,10 @@
321 # So?  What about this header?
322 case $ac_header_compiler:$ac_header_preproc in
323   yes:no )
324-    { echo "$as_me:$LINENO: WARNING: GL/glut.h: accepted by the compiler, rejected by the preprocessor!" >&5
325-echo "$as_me: WARNING: GL/glut.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
326-    { echo "$as_me:$LINENO: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&5
327-echo "$as_me: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&2;}
328+    { echo "$as_me:$LINENO: WARNING: GLUT/glut.h: accepted by the compiler, rejected by the preprocessor!" >&5
329+echo "$as_me: WARNING: GLUT/glut.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
330+    { echo "$as_me:$LINENO: WARNING: GLUT/glut.h: proceeding with the preprocessor's result" >&5
331+echo "$as_me: WARNING: GLUT/glut.h: proceeding with the preprocessor's result" >&2;}
332     (
333       cat <<\_ASBOX
334 ## ------------------------------------ ##
335@@ -10037,12 +10037,12 @@
336       sed "s/^/$as_me: WARNING:     /" >&2
337     ;;
338   no:yes )
339-    { echo "$as_me:$LINENO: WARNING: GL/glut.h: present but cannot be compiled" >&5
340-echo "$as_me: WARNING: GL/glut.h: present but cannot be compiled" >&2;}
341-    { echo "$as_me:$LINENO: WARNING: GL/glut.h: check for missing prerequisite headers?" >&5
342-echo "$as_me: WARNING: GL/glut.h: check for missing prerequisite headers?" >&2;}
343-    { echo "$as_me:$LINENO: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&5
344-echo "$as_me: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&2;}
345+    { echo "$as_me:$LINENO: WARNING: GLUT/glut.h: present but cannot be compiled" >&5
346+echo "$as_me: WARNING: GLUT/glut.h: present but cannot be compiled" >&2;}
347+    { echo "$as_me:$LINENO: WARNING: GLUT/glut.h: check for missing prerequisite headers?" >&5
348+echo "$as_me: WARNING: GLUT/glut.h: check for missing prerequisite headers?" >&2;}
349+    { echo "$as_me:$LINENO: WARNING: GLUT/glut.h: proceeding with the preprocessor's result" >&5
350+echo "$as_me: WARNING: GLUT/glut.h: proceeding with the preprocessor's result" >&2;}
351     (
352       cat <<\_ASBOX
353 ## ------------------------------------ ##
354@@ -10053,8 +10053,8 @@
355       sed "s/^/$as_me: WARNING:     /" >&2
356     ;;
357 esac
358-echo "$as_me:$LINENO: checking for GL/glut.h" >&5
359-echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6
360+echo "$as_me:$LINENO: checking for GLUT/glut.h" >&5
361+echo $ECHO_N "checking for GLUT/glut.h... $ECHO_C" >&6
362 if test "${ac_cv_header_GL_glut_h+set}" = set; then
363   echo $ECHO_N "(cached) $ECHO_C" >&6
364 else
365@@ -10083,12 +10083,12 @@
366 echo $ECHO_N "checking for GLUT library... $ECHO_C" >&6
367     if test "x$with_glut_lib" != "x" ; then
368         if test -d "$with_glut_lib" ; then
369-            LIBS="-L$with_glut_lib -lglut"
370+            LIBS="-L$with_glut_lib -framework GLUT -framework OpenGL -lobjc"
371         else
372             LIBS="$with_glut_lib"
373         fi
374     else
375-        LIBS="-lglut"
376+        LIBS="-framework GLUT -framework OpenGL -lobjc"
377     fi
378     cat >conftest.$ac_ext <<_ACEOF
379 #line $LINENO "configure"
380@@ -10136,7 +10136,7 @@
381 
382     if test "x$HAVE_GLUT" = xno ; then
383         # Try again with the GL libs
384-        LIBS="-lglut $GL_LIBS"
385+        LIBS="-framework GLUT -framework OpenGL -lobjc $GL_LIBS"
386         cat >conftest.$ac_ext <<_ACEOF
387 #line $LINENO "configure"
388 /* confdefs.h.  */
389@@ -10184,7 +10184,7 @@
390 
391     if test "x$HAVE_GLUT" = xno && test "x$GLUT_X_LIBS" != x ; then
392         # Try again with the GL and X11 libs
393-        LIBS="-lglut $GL_LIBS $GLUT_X_LIBS"
394+        LIBS="-framework GLUT -framework OpenGL -lobjc $GL_LIBS $GLUT_X_LIBS"
395         cat >conftest.$ac_ext <<_ACEOF
396 #line $LINENO "configure"
397 /* confdefs.h.  */
Note: See TracBrowser for help on using the repository browser.