gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-21 02:41:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GSWAdaptors/Apache/configure.ac: Only add to CPPFLAGS if

Browse source 
ac_x_includes is set and only add LDFLAGS if ac_x_libraries
        set.  Refer to variables in consistent form.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@21228 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2005-05-16 11:21:27 +00:00
parent 400fe30d41
commit 81efc31c12
3 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-05-16 David Ayers <d.ayers@inode.at>
* GSWAdaptors/Apache/configure.ac: Only add to CPPFLAGS if
ac_x_includes is set and only add LDFLAGS if ac_x_libraries
set. Refer to variables in consistent form.
2005-05-09 David Ayers <d.ayers@inode.at>
* GSWAdaptors/Apache/mod_gsweb.c: Rename GSWeb_Module to

24
GSWAdaptors/Apache/configure vendored
View file

@ -2824,9 +2824,13 @@ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
fi
if test "${have_x}" == yes; then
CPPFLAGS="$CPPFLAGS -I${ac_x_includes}"
LDFLAGS="$LDFLAGS -L${ac_x_libraries}"
if test x${have_x} == xyes; then
if test x${ac_x_includes} != x; then
CPPFLAGS="$CPPFLAGS -I${ac_x_includes}"
fi
if test x${ac_x_libraries} != x; then
LDFLAGS="$LDFLAGS -L${ac_x_libraries}"
fi
else
# We will now really try to just make this work here by testing
# certain common paths explicitly.
@ -3381,7 +3385,7 @@ fi;
# Set APXS_NAME
# Default to apxs but remeber in APXS_OPT that no option was given.
if test "$APXS_OPT" = "default" ; then
if test x$APXS_OPT = xdefault ; then
APXS_NAME=apxs
else
APXS_NAME="$APXS_OPT"
@ -3432,8 +3436,8 @@ else
echo "${ECHO_T}no" >&6
fi
if test "$APXS_OPT" = "default" ; then
if test "$APXS" = "no" -o "$APXS" = "" ; then
if test x${APXS_OPT} = xdefault ; then
if test x${APXS} = xno -o x${APXS} = x ; then
# Extract the first word of "apxs2", so it can be a program name with args.
set dummy apxs2; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@ -3479,7 +3483,7 @@ fi
fi
fi
if test "$APXS" = "no" -o "$APXS" = ""; then
if test x${APXS} = xno -o x${APXS} = x ; then
{ { echo "$as_me:$LINENO: error: apxs tool not found. Check path or use --with-apxs and specify a full path to the apxs tool. " >&5
echo "$as_me: error: apxs tool not found. Check path or use --with-apxs and specify a full path to the apxs tool. " >&2;}
{ (exit 1); exit 1; }; }
@ -3499,7 +3503,7 @@ if test "${with_server_api+set}" = set; then
else
server_api="no"
fi;
if test ${server_api} != "no"; then
if test x${server_api} != xno ; then
SERVERAPI="${server_api}"
else
APXS_TARGET=`$APXS -q TARGET`
@ -3556,13 +3560,13 @@ echo $ECHO_N "checking server API... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $SERVERAPI" >&5
echo "${ECHO_T}$SERVERAPI" >&6
if test "$SERVERAPI" = "unknown"; then
if test x${SERVERAPI} = xunknown ; then
{ { echo "$as_me:$LINENO: error: Could not determine Apache API version. Use --with-server-api and specify either Apache or Apache2. " >&5
echo "$as_me: error: Could not determine Apache API version. Use --with-server-api and specify either Apache or Apache2. " >&2;}
{ (exit 1); exit 1; }; }
fi
if test ${SERVERAPI} == "Apache2"; then
if test x${SERVERAPI} == xApache2 ; then
# Extract the first word of ""$APRCONFIG_NAME"", so it can be a program name with args.
set dummy "$APRCONFIG_NAME"; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5

24
GSWAdaptors/Apache/configure.ac
View file

@ -42,9 +42,13 @@ esac
# directories for headers and libraries when available.
AC_PATH_X
if test "${have_x}" == yes; then
CPPFLAGS="$CPPFLAGS -I${ac_x_includes}"
LDFLAGS="$LDFLAGS -L${ac_x_libraries}"
if test x${have_x} == xyes; then
if test x${ac_x_includes} != x; then
CPPFLAGS="$CPPFLAGS -I${ac_x_includes}"
fi
if test x${ac_x_libraries} != x; then
LDFLAGS="$LDFLAGS -L${ac_x_libraries}"
fi
else
# We will now really try to just make this work here by testing
# certain common paths explicitly.
@ -70,7 +74,7 @@ AC_ARG_WITH(apr-config,
# Set APXS_NAME
# Default to apxs but remeber in APXS_OPT that no option was given.
if test "$APXS_OPT" = "default" ; then
if test x$APXS_OPT = xdefault ; then
APXS_NAME=apxs
else
APXS_NAME="$APXS_OPT"
@ -82,15 +86,15 @@ if test -x "$APXS_NAME"; then
APXS=APXS_NAME
else
AC_PATH_PROG(APXS, "$APXS_NAME", "no", $BIN_PATH)
if test "$APXS_OPT" = "default" ; then
if test "$APXS" = "no" -o "$APXS" = "" ; then
if test x${APXS_OPT} = xdefault ; then
if test x${APXS} = xno -o x${APXS} = x ; then
AC_PATH_PROG(APXS2, apxs2, "no", $BIN_PATH)
APXS="$APXS2"
fi
fi
fi
if test "$APXS" = "no" -o "$APXS" = ""; then
if test x${APXS} = xno -o x${APXS} = x ; then
AC_MSG_ERROR([ apxs tool not found. Check path or use --with-apxs and specify a full path to the apxs tool. ])
fi
@ -103,7 +107,7 @@ fi
AC_ARG_WITH(server-api,
[[ --with-server-api=[Apache|Apache2] Specify SERVERAPI explicitly.]],
server_api="$withval", server_api="no")
if test ${server_api} != "no"; then
if test x${server_api} != xno ; then
SERVERAPI="${server_api}"
else
APXS_TARGET=`$APXS -q TARGET`
@ -119,11 +123,11 @@ fi
AC_MSG_CHECKING(server API)
AC_MSG_RESULT($SERVERAPI)
if test "$SERVERAPI" = "unknown"; then
if test x${SERVERAPI} = xunknown ; then
AC_MSG_ERROR([ Could not determine Apache API version. Use --with-server-api and specify either Apache or Apache2. ])
fi
if test ${SERVERAPI} == "Apache2"; then
if test x${SERVERAPI} == xApache2 ; then
AC_PATH_PROG(APRCONFIG, "$APRCONFIG_NAME", "no", $BIN_PATH)
fi