Geoff McLane:
Support --with-plib and --with-osg for non-standard installations.
This commit is contained in:
parent
fa542403b9
commit
edf9447389
1 changed files with 18 additions and 1 deletions
19
configure.ac
19
configure.ac
|
@ -26,6 +26,22 @@ if test "x$with_simgear" != "x" ; then
|
||||||
EXTRA_DIRS="${EXTRA_DIRS} $with_simgear"
|
EXTRA_DIRS="${EXTRA_DIRS} $with_simgear"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# specify the plib location
|
||||||
|
AC_ARG_WITH(plib, [ --with-plib=PREFIX Specify the prefix path to plib])
|
||||||
|
|
||||||
|
if test "x$with_plib" != "x" ; then
|
||||||
|
echo "plib prefix is $with_plib"
|
||||||
|
EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# specify the osg location
|
||||||
|
AC_ARG_WITH(osg, [ --with-osg=PREFIX Specify the prefix path to osg])
|
||||||
|
|
||||||
|
if test "x$with_osg" != "x" ; then
|
||||||
|
echo "osg prefix is $with_osg"
|
||||||
|
EXTRA_DIRS="${EXTRA_DIRS} $with_osg"
|
||||||
|
fi
|
||||||
|
|
||||||
dnl set the $host variable based on local machine/os
|
dnl set the $host variable based on local machine/os
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
|
@ -142,7 +158,8 @@ dnl Check for MS Windows environment
|
||||||
AC_CHECK_HEADER(windows.h)
|
AC_CHECK_HEADER(windows.h)
|
||||||
|
|
||||||
dnl extra library and include directories
|
dnl extra library and include directories
|
||||||
EXTRA_DIRS="/usr/local/plib /usr/X11R6"
|
# EXTRA_DIRS="/usr/local/plib /usr/X11R6"
|
||||||
|
EXTRA_DIRS="$EXTRA_DIRS /usr/X11R6"
|
||||||
|
|
||||||
if test -d /opt/X11R6 ; then
|
if test -d /opt/X11R6 ; then
|
||||||
EXTRA_DIRS="$EXTRA_DIRS /opt/X11R6"
|
EXTRA_DIRS="$EXTRA_DIRS /opt/X11R6"
|
||||||
|
|
Loading…
Add table
Reference in a new issue