diff --git a/Makefile b/Makefile
index 94aed6ae5feed935e56c8fb26976f11618a0d5ea..a811c6171091c6904f9dd4d16e5b8a8bb7217fd0 100644
--- a/Makefile
+++ b/Makefile
@@ -37,10 +37,12 @@ MODULES += x11ttf
endif
endif
ifneq ($(OPENGLINCDIR),)
-ifneq ($(OPENGLLIBDIR),)
+ifneq ($(OPENGLULIB),)
+ifneq ($(OPENGLLIB),)
MODULES += gl
endif
endif
+endif
ifneq ($(MYSQLINCDIR),)
ifneq ($(MYSQLLIBDIR),)
MODULES += mysql
@@ -357,7 +359,8 @@ showbuild:
@echo "TTFLIBDIR = $(TTFLIBDIR)"
@echo "TTFINCDIR = $(TTFINCDIR)"
@echo "TTFFONTDIR = $(TTFFONTDIR)"
- @echo "OPENGLLIBDIR = $(OPENGLLIBDIR)"
+ @echo "OPENGLULIB = $(OPENGLULIB)"
+ @echo "OPENGLLIB = $(OPENGLLIB)"
@echo "OPENGLINCDIR = $(OPENGLINCDIR)"
@echo "CERNLIBDIR = $(CERNLIBDIR)"
@echo "THREAD = $(THREAD)"
diff --git a/config/Makefile.aix b/config/Makefile.aix
index 972a5db35401bee7dd3bbdd215fd4edad44e5ebd..7fc4dfc7c5d938e4fe7694565f386a8bfd50ee92 100644
--- a/config/Makefile.aix
+++ b/config/Makefile.aix
@@ -68,6 +68,6 @@ VENUSLIBDEP = $(EGLIB)
VENUSLIBEXTRA = -lEG
X11TTFLIBDEP = $(X11LIB)
X11TTFLIBEXTRA = -lGX11 -L$(TTFLIBDIR) -lttf -lX11
-GLLIBDEP = $(GPADLIB) $(G3DLIB) $(GUILIB)
-GLLIBEXTRA = -lGpad -lGraf3d -lGui $(OPENGLLIBDIR)/libGLU.a \
- $(OPENGLLIBDIR)/libGL.a -lX11 -lXext -lXmu -lXi
+GLLIBDEP = $(GPADLIB) $(G3DLIB) $(GUILIB)
+GLLIBEXTRA = -lGpad -lGraf3d -lGui $(OPENGLULIB) \
+ $(OPENGLLIB) -lX11 -lXext -lXmu -lXi
diff --git a/config/Makefile.alphacxx6 b/config/Makefile.alphacxx6
index bea93945a62d31eb2b94c8d8a8b99c1cba03e96f..856dc502b6ee35c940cc7813ae5c9e6d3d6e0c70 100644
--- a/config/Makefile.alphacxx6
+++ b/config/Makefile.alphacxx6
@@ -38,5 +38,4 @@ F77LIBS = /usr/shlib/libFutil.so /usr/shlib/libfor.so /usr/shlib/libots.so
# Extras
CORELIBDEP = $(G3DLIB) $(GRAFLIB) $(HISTLIB)
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -lX11 -lXext -lXmu -lXi -lm
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -lX11 -lXext -lXmu -lXi -lm
diff --git a/config/Makefile.alphaegcs b/config/Makefile.alphaegcs
index 36701efaa13636ff92b16819c1eee13a561a4a83..1cccfbd689080755385808e3cb17452e5d7f331b 100644
--- a/config/Makefile.alphaegcs
+++ b/config/Makefile.alphaegcs
@@ -38,5 +38,4 @@ F77 = g77
F77LD = g77
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -lX11 -lXext -lXmu -lXi -lm
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -lX11 -lXext -lXmu -lXi -lm
diff --git a/config/Makefile.alphakcc b/config/Makefile.alphakcc
index 08905972056e276fbb6271b1664491f4a51dfc7a..89603a740b3487c86b3046e929a13e0324263e18 100644
--- a/config/Makefile.alphakcc
+++ b/config/Makefile.alphakcc
@@ -70,5 +70,4 @@ F77FLAGS = -O0 -recursive -nofor_main
F77LIBS = /usr/lib/libfor.a -lUfor -lFutil
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -lX11 -lXext -lXmu -lXi -lm
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -lX11 -lXext -lXmu -lXi -lm
diff --git a/config/Makefile.hpux b/config/Makefile.hpux
index 2c5b32a3ba8c3c3dd11a4f5e92bdafd6428c243d..a68a1559cb23e964ae1306ac83041d107719dc2e 100644
--- a/config/Makefile.hpux
+++ b/config/Makefile.hpux
@@ -40,5 +40,4 @@ F77LDFLAGS = -K +ppu $(OPT)
F77LIBS =
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/lib -lXext -lXi -lX11
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/lib -lXext -lXi -lX11
diff --git a/config/Makefile.hpuxacc b/config/Makefile.hpuxacc
index 6bb985a0dfe0092db7bdd5967646a14b3e805181..1f9bfaa08d292193aeed40274a13f6a0f73e4971 100644
--- a/config/Makefile.hpuxacc
+++ b/config/Makefile.hpuxacc
@@ -40,5 +40,5 @@ F77LDFLAGS = -K +ppu $(OPT)
F77LIBS =
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) \
-L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11
diff --git a/config/Makefile.in b/config/Makefile.in
index 767e1fb7b482910fc0bfe00129361d2cee391906..09930244528ab374d18de9bbb176a7b3b02a6806 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -24,7 +24,8 @@ TTFLIBDIR := @ttflibdir@
TTFFONTDIR := @ttffontdir@
TTFINCDIR := @ttfincdir@
-OPENGLLIBDIR := @opengllibdir@
+OPENGLULIB := @openglulib@
+OPENGLLIB := @opengllib@
OPENGLINCDIR := @openglincdir@
MYSQLINCDIR := @mysqlincdir@
diff --git a/config/Makefile.linux b/config/Makefile.linux
index ca8819aa56519514ab97e3858a1fbd5650717b02..589a2d4c1b242bcda863e2e9e983e19d5548270e 100644
--- a/config/Makefile.linux
+++ b/config/Makefile.linux
@@ -38,5 +38,4 @@ F77FLAGS = $(OPT) -Nx800 -NC200
F77LIBS =
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxalphaegcs b/config/Makefile.linuxalphaegcs
index 7172ce8de1243d4ba9c1119b8af626a617689258..623108c2f5c636e00d5cd8fd53f415307a43f915 100644
--- a/config/Makefile.linuxalphaegcs
+++ b/config/Makefile.linuxalphaegcs
@@ -41,5 +41,4 @@ F77FLAGS =
F77LIBS = -lg2c -lnsl
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxdeb b/config/Makefile.linuxdeb
index 4f3e3049b27722eafa8213e40ec5755d24d32c74..970fa929aca29087f83c0c19187e195940b6a8a0 100644
--- a/config/Makefile.linuxdeb
+++ b/config/Makefile.linuxdeb
@@ -35,5 +35,4 @@ CILIBS = -lm -lncurses -ldl -rdynamic
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxdeb2 b/config/Makefile.linuxdeb2
index 7a2720cf0ff2daf720ef54c0eb1e78de463f5588..aa6ac94187f0d6997d2d561c016956c6b97d5d7b 100644
--- a/config/Makefile.linuxdeb2
+++ b/config/Makefile.linuxdeb2
@@ -43,5 +43,4 @@ F77FLAGS = $(OPT)
F77LIBS = -lg2c
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxdeb2ppc b/config/Makefile.linuxdeb2ppc
index 7b3ffc3a3a0ad8547af0bf0b4a293bc72d86a0eb..3918f5038a3bb751d5a3ac6b345f165bea2b8c81 100644
--- a/config/Makefile.linuxdeb2ppc
+++ b/config/Makefile.linuxdeb2ppc
@@ -43,5 +43,4 @@ F77FLAGS = $(OPT)
F77LIBS = -lg2c
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxegcs b/config/Makefile.linuxegcs
index 06d95b83338c306bcf89c85582084935a0c9d7e2..c683b33307d4779c3ec326b351f565e1dd732b1e 100644
--- a/config/Makefile.linuxegcs
+++ b/config/Makefile.linuxegcs
@@ -41,5 +41,4 @@ F77FLAGS =
F77LIBS = -lg2c -lnsl
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxia64gcc b/config/Makefile.linuxia64gcc
index ac2055eb05f508db5679f56451b4a87c96bd62e4..51596906e8756016acc7e3d2544af47f4bcc0b8b 100644
--- a/config/Makefile.linuxia64gcc
+++ b/config/Makefile.linuxia64gcc
@@ -41,5 +41,4 @@ F77FLAGS =
F77LIBS = -lg2c -lnsl
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxkcc b/config/Makefile.linuxkcc
index 64b36801caa33f79ae65ab1b9cf897aed66574e3..7d4204bb953b029f84e21a0e4a59a9e995684683 100644
--- a/config/Makefile.linuxkcc
+++ b/config/Makefile.linuxkcc
@@ -72,5 +72,4 @@ F77LIBS = -lf2c -lnsl
# fix for libGui.so that needs lstat
GUILIBEXTRA = -lc
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxpgcc b/config/Makefile.linuxpgcc
index 7085cbd1753b4fec7810b847bf065ff1cdb7e69f..02997252064b7667c200b2d6473671045ffc7046 100644
--- a/config/Makefile.linuxpgcc
+++ b/config/Makefile.linuxpgcc
@@ -40,5 +40,4 @@ F77FLAGS = $(OPT)
F77LIBS = -lg2c
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxppcegcs b/config/Makefile.linuxppcegcs
index f06084a0e819e7fb8ec8d9f260544aaa07cb6f1d..885a7af84206dbc891ab63904bfa83ccb7558a0e 100644
--- a/config/Makefile.linuxppcegcs
+++ b/config/Makefile.linuxppcegcs
@@ -40,5 +40,4 @@ CRYPTLIBS = -lcrypt
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxrh42 b/config/Makefile.linuxrh42
index fa6c334c2f728cc92c3510be2020ee4098516db6..fdcc36506acaa55a43a560d14d27011ad2a00883 100644
--- a/config/Makefile.linuxrh42
+++ b/config/Makefile.linuxrh42
@@ -35,5 +35,4 @@ CILIBS = -lm -ltermcap -lbsd -ldl -lg++ -rdynamic
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.linuxsuse6 b/config/Makefile.linuxsuse6
index 4b6e3290dc745dc27c4a665efefa9976d3c41331..4d5ab2e0e15c239604dd990c26abfb6daa3dc28e 100644
--- a/config/Makefile.linuxsuse6
+++ b/config/Makefile.linuxsuse6
@@ -38,5 +38,4 @@ F77FLAGS = $(OPT)
F77LIBS = -lg2c
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
- -L/usr/X11R6/lib -lXmu
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) -L/usr/X11R6/lib -lXmu
diff --git a/config/Makefile.sgicc b/config/Makefile.sgicc
index f32ccacdaf4f0d9e9f53d098845a16252bab1d85..5cb344fd7ae873ae658a3cc652912d16f424da5a 100644
--- a/config/Makefile.sgicc
+++ b/config/Makefile.sgicc
@@ -40,5 +40,5 @@ else
F77LIBS = -lI77 -lU77 -lF77 -lisam
endif
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB)
diff --git a/config/Makefile.sgiegcs b/config/Makefile.sgiegcs
index b176a4b98697bdf7a93e7a88774871b6e026745c..03bacd95f446c75dde4db580a46d381ccc27dc1a 100644
--- a/config/Makefile.sgiegcs
+++ b/config/Makefile.sgiegcs
@@ -34,7 +34,7 @@ XLIBS = $(XPMLIB) -L/usr/X11R6/lib -lX11
CILIBS = -lm -lgen -lbsd -lstdc++
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB)
# Fortran:
F77LIBS = -lftn
diff --git a/config/Makefile.sgikcc b/config/Makefile.sgikcc
index fa3bda69b5a4a211db433a5956544613fb0dad56..7879caf271878bab07aafcfa3b91795cfafd5b5a 100644
--- a/config/Makefile.sgikcc
+++ b/config/Makefile.sgikcc
@@ -13,7 +13,7 @@ CXXOPT = +K0
OPT = -g -O0
NOOPT =
else
-CXXOPT = +K3
+CXXOPT = +K3
OPT = -O2
NOOPT =
endif
@@ -43,14 +43,14 @@ CXXFLAGS = $(ABI) $(EXCEPTION) --signed_chars --display_error_number \
--diag_suppress 68 --diag_suppress 191 --diag_suppress 830 \
--diag_suppress 837 $(CXXOPT) -DSGI_REL=$(SGI_REL) \
$(EXTRA_CXXFLAGS) \
-
+
CFLAGS = $(ABI) -signed $(EXTRA_CFLAGS)
CINTCXXFLAGS = $(ABI) $(EXCEPTION) --signed_chars --display_error_number \
--diag_suppress 68 --diag_suppress 191 --diag_suppress 830 \
--diag_suppress 837 -DG__REGEXP1 -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__SIGNEDCHAR -DG__ROOT -DG__REDIRECTIO $(CXXOPT) \
--diag_suppress 426 $(EXTRA_CXXFLAGS)
-
+
CINTCFLAGS = $(ABI) -signed -w -DG__REGEXP1 -DG__UNIX -DG__SHAREDLIB \
-DG__OSFDLL -DG__SIGNEDCHAR -DG__ROOT -DG__REDIRECTIO \
-D__KCC $(EXTRA_CFLAGS)
@@ -83,5 +83,5 @@ F77LIBS = -lI77 -lU77 -lF77 -lisam
endif
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB)
diff --git a/config/Makefile.solaris b/config/Makefile.solaris
index 7a9dc2fd94d03524dff01940c8dfe0b4631b9cb8..f8b5ef76c0c9a9340396fc405a395ca543c4af30 100644
--- a/config/Makefile.solaris
+++ b/config/Makefile.solaris
@@ -38,6 +38,6 @@ F77 = /opt/SUNWspro/bin/f77
F77LIBS = $(CERNLIB)/libpacklib.a -lM77 -lF77 -lsunmath -lsocket -lnsl
# Extras
-GLLIBEXTRA = $(OPENGLLIBDIR)/libGLU.a $(OPENGLLIBDIR)/libGL.a \
+GLLIBEXTRA = $(OPENGLULIB) $(OPENGLLIB) \
-L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
diff --git a/configure b/configure
index a6e897aeb5c5d95083435f56b02259bd41b51d63..0aa603d2e1d71af35952698ee1288a00af247934 100755
--- a/configure
+++ b/configure
@@ -228,7 +228,7 @@ echo $ac_n "Checking for ttf fonts (arial.ttf)... $ac_c"
ttffontdirs="$TTF $TTF/fonts /usr/lib/X11/fonts /usr/lib/X11/fonts/ttf \
/usr/share /usr/share/fonts /usr/share/fonts/ttf \
/usr/share/ttf /usr/local/share /usr/local/share/fonts \
- /usr/local/share/fonts/ttf /usr/local/share/ttf
+ /usr/local/share/fonts/ttf /usr/local/share/ttf
/opt/fonts /opt/fonts/ttf /opt/ttf"
if [ -z "$ttffontdir" ]; then
@@ -268,27 +268,60 @@ if [ -z "$openglincdir" ]; then
fi
echo $openglincdir
-echo $ac_n "Checking for libGL.a... $ac_c"
+echo $ac_n "Checking for libGL... $ac_c"
opengllibdirs="$OPENGL $OPENGL/lib /usr/lib /usr/local/lib /usr/lib/X11 \
/usr/X11R6/lib /usr/local/lib/X11 /usr/local/X11R6/lib \
/usr/X11/lib /usr/lib/Mesa /usr/local/lib/Mesa /usr/Mesa/lib \
/usr/local/Mesa/lib /usr/Mesa /usr/local/Mesa /opt/Mesa \
/opt/Mesa/lib"
+opengllibs="libGL.a libGL.so" # favour .a over .so
+opengllib=NO
if [ -z "$opengllibdir" ]; then
- opengllibdir=NO
if [ "$OPENGL" != "NO" ]; then
for i in $opengllibdirs; do
- for j in libGL.a; do
+ for j in $opengllibs; do
if [ -r "$i/$j" ]; then
- opengllibdir=$i
+ opengllib=$i/$j
break 2
fi
done
done
fi
+else
+ for j in $opengllibs; do
+ if [ -r "$opengllibdir/$j" ]; then
+ opengllib=$opengllibdir/$j
+ break 1
+ fi
+ done
+fi
+echo $opengllib
+
+echo $ac_n "Checking for libGLU... $ac_c"
+openglulibs="libGLU.a libGLU.so" # favour .a over .so
+openglulib=NO
+
+if [ -z "$opengllibdir" ]; then
+ if [ "$OPENGL" != "NO" ]; then
+ for i in $opengllibdirs; do
+ for j in $openglulibs; do
+ if [ -r "$i/$j" ]; then
+ openglulib=$i/$j
+ break 2
+ fi
+ done
+ done
+ fi
+else
+ for j in $openglulibs; do
+ if [ -r "$opengllibdir/$j" ]; then
+ openglulib=$opengllibdir/$j
+ break 1
+ fi
+ done
fi
-echo $opengllibdir
+echo $openglulib
# Check for Xpm library
echo $ac_n "Checking for libXpm.a... $ac_c"
@@ -492,7 +525,8 @@ if [ -n "$haveconfig" ] ; then
if [ "$ttflibdir" = "NO" ]; then unset ttflibdir ; fi
if [ "$ttffontdir" = "NO" ]; then unset ttffontdir ; fi
if [ "$openglincdir" = "NO" ]; then unset openglincdir ; fi
- if [ "$opengllibdir" = "NO" ]; then unset opengllibdir ; fi
+ if [ "$opengllib" = "NO" ]; then unset opengllib ; fi
+ if [ "$openglulib" = "NO" ]; then unset openglulib ; fi
if [ "$cernlibdir" = "NO" ]; then unset cernlibdir ; fi
if [ "$rfio" = "NO" ]; then unset rfio ; fi
if [ "$mysqlincdir" = "NO" ]; then unset mysqlincdir ; fi
@@ -529,7 +563,8 @@ else
if [ "$ttflibdir" = "NO" ]; then unset ttflibdir ; fi
if [ "$ttffontdir" = "NO" ]; then unset ttffontdir ; fi
if [ "$openglincdir" = "NO" ]; then unset openglincdir ; fi
- if [ "$opengllibdir" = "NO" ]; then unset opengllibdir ; fi
+ if [ "$opengllib" = "NO" ]; then unset opengllib ; fi
+ if [ "$openglulib" = "NO" ]; then unset openglulib ; fi
if [ "$cernlibdir" = "NO" ]; then unset cernlibdir ; fi
if [ "$rfio" = "NO" ]; then unset rfio ; fi
if [ "$mysqlincdir" = "NO" ]; then unset mysqlincdir ; fi
@@ -563,7 +598,8 @@ sed -e "s|@architecture@|$arch|" \
-e "s|@ttflibdir@|$ttflibdir|" \
-e "s|@ttffontdir@|$ttffontdir|" \
-e "s|@ttfincdir@|$ttfincdir|" \
- -e "s|@opengllibdir@|$opengllibdir|" \
+ -e "s|@openglulib@|$openglulib|" \
+ -e "s|@opengllib@|$opengllib|" \
-e "s|@openglincdir@|$openglincdir|" \
-e "s|@cernlibdir@|$cernlibdir|" \
-e "s|@rfio@|$rfio|" \