jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge patch from Torsten Landschoff <torsten@debian.org>

Browse source 
for improving Pike configuration.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6942 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Matthias Köppe 2005-02-13 12:48:41 +00:00
commit 7c80d895b9
1 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

39
SWIG/configure.in
View file

@ -1218,6 +1218,7 @@ AC_SUBST(OCAMLMKTOP)
#---------------------------------------------------------------- #----------------------------------------------------------------
# Identify the name of the Pike executable # Identify the name of the Pike executable
# Priority: configure option, automatic search
PIKEBIN= PIKEBIN=
AC_ARG_WITH(pike, AS_HELP_STRING([--without-pike], [Disable Pike]) AC_ARG_WITH(pike, AS_HELP_STRING([--without-pike], [Disable Pike])
AS_HELP_STRING([--with-pike=path], [Set location of Pike executable]),[ PIKEBIN="$withval"], [PIKEBIN=]) AS_HELP_STRING([--with-pike=path], [Set location of Pike executable]),[ PIKEBIN="$withval"], [PIKEBIN=])
@ -1228,35 +1229,49 @@ AC_MSG_NOTICE([Disabling Pike])
else else
if test -z "$PIKEBIN"; then if test -z "$PIKEBIN"; then
AC_CHECK_PROGS(PIKE, pike) AC_CHECK_PROGS(PIKE, pike pike7.6 pike7.4 pike7.2)
else else
PIKE="$PIKEBIN" PIKE="$PIKEBIN"
fi fi
# Check for a --with-pikeincl option to configure
PIKEINCLUDE=
AC_ARG_WITH(pikeincl,[ --with-pikeincl=path Set location of Pike include directory],[
PIKEINCLUDE="-I$withval"], [PIKEINCLUDE=])
AC_MSG_CHECKING(for Pike header files) # Check for pike-config
if test -z "$PIKEINCLUDE"; then # Priority: configure option, guessed from $PIKE, search from list
if test -n "$PIKE"; then AC_ARG_WITH(pike-config, AS_HELP_STRING([--with-pike-config=path],
[Set location of pike-config script]),
[PIKECONFIG="$withval"], [PIKECONFIG=""])
if test -z "$PIKECONFIG" -a -n "$PIKE"; then
AC_CHECK_PROGS(PIKECONFIG, $PIKE-config pike-config \
pike7.6-config pike7.4-config pike7.2-config)
fi
# Check for a --with-pikeincl option to configure
# Priority: configure option, info from $PIKECONFIG, guessed by pike script
AC_ARG_WITH(pikeincl, AS_HELP_STRING([--with-pikeincl=path],
[Set location of Pike include directory]),
[PIKEINCLUDE="-I$withval"], [PIKEINCLUDE=])
AC_MSG_CHECKING([for Pike header files])
if test -z "$PIKEINCLUDE" -a -n "$PIKECONFIG"; then
PIKEINCLUDE=`$PIKECONFIG --cflags`
fi
if test -z "$PIKEINCLUDE" -a -n "$PIKE"; then
PIKEPATH=`which $PIKE` PIKEPATH=`which $PIKE`
PIKEINCLUDE=`$PIKE Tools/check-include-path.pike $PIKEPATH` PIKEINCLUDE=`$PIKE Tools/check-include-path.pike $PIKEPATH`
AC_MSG_RESULT($PIKEINCLUDE)
PIKEINCLUDE="-I$PIKEINCLUDE" PIKEINCLUDE="-I$PIKEINCLUDE"
fi fi
if test -z "$PIKEINCLUDE"; then if test -z "$PIKEINCLUDE"; then
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
fi
else else
AC_MSG_RESULT($PIKEINCLUDE) AC_MSG_RESULT($PIKEINCLUDE)
fi fi
fi fi
AC_SUBST(PIKEINCLUDE) AC_SUBST(PIKEINCLUDE)
AC_SUBST(PIKECCDLFLAGS) AC_SUBST(PIKECCDLFLAGS) dnl XXX: where is this used/defined?
AC_SUBST(PIKEDYNAMICLINKING) AC_SUBST(PIKEDYNAMICLINKING) dnl XXX: where is this used/defined?
#---------------------------------------------------------------- #----------------------------------------------------------------
# Look for CHICKEN # Look for CHICKEN