|
From: <kw...@us...> - 2003-10-01 19:52:24
|
Update of /cvsroot/aedgui/aedGUI
In directory sc8-pr-cvs1:/tmp/cvs-serv29630
Modified Files:
configure.in ltconfig
Log Message:
Hacked the hell out of ltconfig, MSYS-1.0.9 + Mingw-3.1.0 works now, some changes on configure.in about gltest
Index: configure.in
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/configure.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** configure.in 26 Sep 2003 20:17:38 -0000 1.46
--- configure.in 1 Oct 2003 19:52:17 -0000 1.47
***************
*** 55,79 ****
AC_CHECK_HEADERS(dlfcn.h)
! dnl OpenGL test stuff
! dnl The LIB checks dont work under windows because GL calls are stdcall
! dnl and the test program fails to link them :-(
! AC_CHECK_HEADER(gl/gl.h, [have_gl_hdr=yes], [have_gl_hdr=no])
! case "$target" in
! *-*-cygwin* | *-*-mingw32*)
! GL_LIBS="$GL_LIBS -lopengl32"
! GL_LIBS="$GL_LIBS -lglu32"
! ;;
! *-*-*)
! AC_CHECK_LIB(GL,glLoadIdentity,[GL_LIBS="$GL_LIBS -lGL"])
! AC_CHECK_LIB(GLU,gluPerspective,[GL_LIBS="$GL_LIBS -lGLU"])
! ;;
! esac
! if test "x$have_gl_hdr"="xno"; then
! COMMENTOUT="#"
! fi
! AC_SUBST(GL_LIBS)
! AC_SUBST(COMMENTOUT)
!
! dnl The alpha architecture needs special flags for binary portability
case "$target" in
alpha*-*-linux*)
--- 55,59 ----
AC_CHECK_HEADERS(dlfcn.h)
! dnl We no longer need -no-undefined for windows dlls
case "$target" in
alpha*-*-linux*)
***************
*** 84,90 ****
;;
*-*-cygwin* | *-*-mingw32*)
- if test "$enable_shared" = yes; then # create a DLL
- LDFLAGS="$LDFLAGS -no-undefined"
- fi
if test "$build" != "$target"; then # cross-compiling
# Default cross-compile location
--- 64,67 ----
***************
*** 98,101 ****
--- 75,93 ----
;;
esac
+
+ dnl OpenGL test stuff
+ dnl The LIB checks dont work under windows because GL calls are stdcall
+ dnl and the test program fails to link them :-(
+ AC_CHECK_HEADER(gl/gl.h, [have_gl_hdr=yes])
+ case "$target" in
+ *-*-cygwin* | *-*-mingw32*)
+ GL_LIBS="$GL_LIBS -lopengl32 -lglu32"
+ ;;
+ *-*-*)
+ AC_CHECK_LIB(GL,glLoadIdentity,[GL_LIBS="$GL_LIBS -lGL"])
+ AC_CHECK_LIB(GLU,gluPerspective,[GL_LIBS="$GL_LIBS -lGLU"])
+ ;;
+ esac
+ AC_SUBST(GL_LIBS)
dnl Shared object extensions
Index: ltconfig
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/ltconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ltconfig 21 Aug 2003 01:01:47 -0000 1.1
--- ltconfig 1 Oct 2003 19:52:17 -0000 1.2
***************
*** 1170,1174 ****
;;
! cygwin* | mingw*)
# Special flag that tells Cygwin to use the native MSVC runtime
case "$host_os" in
--- 1170,1183 ----
;;
! mingw*)
! # hardcode_libdir_flag_spec is actually meaningless, as there is
! # no search path for DLLs.
! hardcode_libdir_flag_spec='-L$libdir'
! # allow_undefined_flag=unsupported
! always_export_symbols=yes
! archive_expsym_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts -Wl,--output-def,$objdir/$soname-def'
! old_archive_from_new_cmds='$DLLTOOL --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
! ;;
! cygwin*)
# Special flag that tells Cygwin to use the native MSVC runtime
case "$host_os" in
|