3 modified files
SimDist
diff -u -r1.82 -r1.83
--- configure 26 Jul 2010 21:14:25 -0000 1.82
+++ configure 17 Aug 2010 19:09:57 -0000 1.83
@@ -814,9 +814,10 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-prefix=<path> binary installation base area
--with-cvsuser=<username>
SLAC CVS user name. (Default is anonymous)
- --with-prefix=<path> binary installation base area
+ --with-opengl=<path> OpenGL installation directory
--with-distdir=<path> Set distribution directory with format:
<username>@<host>:<dir>
@@ -1376,6 +1377,31 @@
+
+
+echo "$as_me:$LINENO: checking for installation prefix" >&5
+echo $ECHO_N "checking for installation prefix... $ECHO_C" >&6
+
+
+# Check whether --with-prefix or --without-prefix was given.
+if test "${with_prefix+set}" = set; then
+ withval="$with_prefix"
+ prefix=$with_prefix
+else
+ prefix=/usr/local
+fi;
+
+if test -d "$prefix" ; then
+ echo "$as_me:$LINENO: result: $prefix" >&5
+echo "${ECHO_T}$prefix" >&6
+else
+ { { echo "$as_me:$LINENO: error: $prefix is not a directory" >&5
+echo "$as_me: error: $prefix is not a directory" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
@@ -2262,31 +2288,6 @@
-echo "$as_me:$LINENO: checking for installation prefix" >&5
-echo $ECHO_N "checking for installation prefix... $ECHO_C" >&6
-
-
-# Check whether --with-prefix or --without-prefix was given.
-if test "${with_prefix+set}" = set; then
- withval="$with_prefix"
- prefix=$with_prefix
-else
- prefix=/usr/local
-fi;
-
-if test -d "$prefix" ; then
- echo "$as_me:$LINENO: result: $prefix" >&5
-echo "${ECHO_T}$prefix" >&6
-else
- { { echo "$as_me:$LINENO: error: $prefix is not a directory" >&5
-echo "$as_me: error: $prefix is not a directory" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
sim_dist_dir_basename=$(basename `pwd`)
@@ -2461,7 +2462,22 @@
-#AC_MSG_CHECKING(for OpenGL installation)
+
+# Check whether --with-opengl or --without-opengl was given.
+if test "${with_opengl+set}" = set; then
+ withval="$with_opengl"
+ opengl=$with_opengl
+else
+ opengl=
+fi;
+
+if test -n "$opengl"
+then
+ OGLHOME=$opengl
+fi
+
+
+
if test -z $OGLHOME
then
@@ -2475,6 +2491,11 @@
esac
fi
+echo "$as_me:$LINENO: checking for OpenGL installation" >&5
+echo $ECHO_N "checking for OpenGL installation... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $OGLHOME" >&5
+echo "${ECHO_T}$OGLHOME" >&6
+
as_ac_File=`echo "ac_cv_file_$OGLHOME/include/GL/gl.h" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $OGLHOME/include/GL/gl.h" >&5
echo $ECHO_N "checking for $OGLHOME/include/GL/gl.h... $ECHO_C" >&6
@@ -2500,16 +2521,11 @@
fi
-echo "$as_me:$LINENO: checking for OpenGL installation" >&5
-echo $ECHO_N "checking for OpenGL installation... $ECHO_C" >&6
-
-if test -n "$OGLHOME"
+if test -z "$OGLHOME"
then
- echo "$as_me:$LINENO: result: $OGLHOME" >&5
-echo "${ECHO_T}$OGLHOME" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { { echo "$as_me:$LINENO: error: valid OpenGL installation not found" >&5
+echo "$as_me: error: valid OpenGL installation not found" >&2;}
+ { (exit 1); exit 1; }; }
fi
SimDist
diff -u -r1.10 -r1.11
--- configure.in 25 Jun 2009 18:55:40 -0000 1.10
+++ configure.in 17 Aug 2010 19:09:57 -0000 1.11
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.10 2009/06/25 18:55:40 jeremy Exp $
+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.11 2010/08/17 19:09:57 jeremy Exp $
dnl
dnl Process this file with autoconf to produce the configure script for SimDist.
dnl
@@ -10,13 +10,16 @@
v1r0p0,
[log in to unmask])
-dnl Set the host variables.
+dnl Set the Autoconf host variables.
AC_CANONICAL_HOST
dnl Set which variable to use for runtime location of shared libs.
AC_OS_SHARED_LIBS_VAR
-dnl Check for required programs.
+dnl Set the installation prefix.
+AC_WITH_PREFIX
+
+dnl Check for required build tools.
AC_PROG_MAKE_SET
AC_PROG_CXX
AC_PROG_CVS
@@ -29,26 +32,24 @@
dnl Set the SLAC CVS username.
AC_WITH_CVSUSER
-dnl Set the installation prefix.
-AC_WITH_PREFIX
-
dnl Initialize the SimDist build.
AC_INIT_SIMDIST
-dnl Setup OpenGL if found.
+dnl Set OpenGL settings.
+AC_WITH_OPENGL
AC_OPENGL
AC_ENABLE_OPENGL
dnl Set G4VERBOSE mode.
AC_ENABLE_G4VERBOSE
-dnl Setup each package.
+dnl Setup each dependency package.
AC_CONFIG_PACKAGES
-dnl Setup name of tarball.
+dnl Set the name of the distribution tarball.
AC_DIST_TGZ
-dnl Select location for dist tarball.
+dnl Select upload location for dist tarball.
AC_WITH_UPLOAD_DIR
dnl Add additional input files.
SimDist/build
diff -u -r1.5 -r1.6
--- ogl.m4 26 Jul 2010 21:12:15 -0000 1.5
+++ ogl.m4 17 Aug 2010 19:09:58 -0000 1.6
@@ -1,7 +1,20 @@
-dnl macro to configure OpenGL
-AC_DEFUN(AC_OPENGL, [
+dnl Macro to specify OpenGL base directory using a configure option.
+AC_DEFUN(AC_WITH_OPENGL, [
+
+AC_ARG_WITH(opengl,
+ AC_HELP_STRING([--with-opengl=<path>], [OpenGL installation directory]),
+ [opengl=$with_opengl],
+ [opengl=])
+
+if test -n "$opengl"
+then
+ OGLHOME=$opengl
+fi
+
+])
-#AC_MSG_CHECKING(for OpenGL installation)
+dnl Macro to configure OpenGL.
+AC_DEFUN(AC_OPENGL, [
if test -z $OGLHOME
then
@@ -15,15 +28,14 @@
esac
fi
-AC_CHECK_FILE($OGLHOME/include/GL/gl.h, [], [OGLHOME=])
-
AC_MSG_CHECKING(for OpenGL installation)
+AC_MSG_RESULT($OGLHOME)
-if test -n "$OGLHOME"
+AC_CHECK_FILE($OGLHOME/include/GL/gl.h, [], [OGLHOME=])
+
+if test -z "$OGLHOME"
then
- AC_MSG_RESULT($OGLHOME)
-else
- AC_MSG_RESULT(no)
+ AC_MSG_ERROR(valid OpenGL installation not found)
fi
AC_SUBST(OGLHOME)
CVSspam 0.2.8