SimDist/build
diff -u -r1.2 -r1.3
--- geant4.m4 22 Jun 2006 23:50:04 -0000 1.2
+++ geant4.m4 5 Jul 2006 23:27:56 -0000 1.3
@@ -72,6 +72,14 @@
G4VIS_BUILD_OPENGLX_DRIVER=1
fi
+# Win32 OpenGL config.
+case "$host_os" in
+ cygwin* )
+ G4VIS_BUILD_OPENGLWIN32_DRIVER=1
+ G4VIS_USE_OPENGLWIN32=1
+ ;;
+esac
+
# terminal
G4UI_USE_TCSH=
G4UI_USE_CSH=
@@ -84,7 +92,6 @@
cygwin* )
G4UI_USE_CSH=1
;;
-
esac
# Built-in visualization.
SimDist
diff -u -r1.40 -r1.41
--- configure 29 Jun 2006 17:23:45 -0000 1.40
+++ configure 5 Jul 2006 23:27:56 -0000 1.41
@@ -2621,6 +2621,14 @@
G4VIS_BUILD_OPENGLX_DRIVER=1
fi
+# Win32 OpenGL config.
+case "$host_os" in
+ cygwin* )
+ G4VIS_BUILD_OPENGLWIN32_DRIVER=1
+ G4VIS_USE_OPENGLWIN32=1
+ ;;
+esac
+
# terminal
G4UI_USE_TCSH=
G4UI_USE_CSH=
@@ -2633,7 +2641,6 @@
cygwin* )
G4UI_USE_CSH=1
;;
-
esac
# Built-in visualization.
@@ -3181,9 +3188,10 @@
# 1. Remove the extension, and $U if already installed.
ac_i=`echo "$ac_i" |
sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs