[sword-cvs] sword configure.ac,1.19,1.20

sword@www.crosswire.org sword@www.crosswire.org
Mon, 7 Jul 2003 07:16:27 -0700


Update of /usr/local/cvsroot/sword
In directory www:/tmp/cvs-serv15875

Modified Files:
	configure.ac 
Log Message:
Added InstallMgr basic feature for remote source installation


Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/sword/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** configure.ac	1 Mar 2003 19:51:12 -0000	1.19
--- configure.ac	7 Jul 2003 14:16:25 -0000	1.20
***************
*** 63,85 ****
  
  # ---------------------------------------------------------------------
- # Check for curl for installmgr suport
- # ---------------------------------------------------------------------
- 
- CURL_CFLAGS=
- CURL_LIBS=
- if test x$enable_installmgr = xyes; then
- 	AC_PATH_PROG(CURL_CONFIG, curl-config, no)
- 	if test "$CURL_CONFIG" = "no" ; then
- 		echo "*** The curl-config script installed by curl could not be found"
- 		echo "*** compiling without install manager support"
- 		enable_installmgr=no
- 	else
- 		echo "curl found - install manager support ok"
- 		CURL_CFLAGS=`$CURL_CONFIG --cflags`
- 		CURL_LIBS=`$CURL_CONFIG --libs`
- 	fi
- fi
- 
- # ---------------------------------------------------------------------
  # Debug and profile
  # ---------------------------------------------------------------------
--- 63,66 ----
***************
*** 114,117 ****
--- 95,117 ----
    CXXFLAGS="$CXXFLAGS -g -finstrument-functions"
    LIBS="$LIBS -g -finstrument-functions -lfnccheck"
+ fi
+ 
+ # ---------------------------------------------------------------------
+ # Check for curl for installmgr suport
+ # ---------------------------------------------------------------------
+ 
+ CURL_CFLAGS=
+ CURL_LIBS=
+ AC_PATH_PROG(CURL_CONFIG, curl-config, no)
+ if test "$CURL_CONFIG" = "no" ; then
+ 	echo "*** The curl-config script installed by curl could not be found"
+ 	echo "*** compiling without install manager support"
+ 	enable_installmgr=no
+ else
+ 	echo "curl found - remote install options available"
+ 	CURL_CFLAGS=`$CURL_CONFIG --cflags`
+ 	CURL_LIBS=`$CURL_CONFIG --libs`
+ 	CXXFLAGS="$CXXFLAGS -DCURLAVAILABLE"
+ 	CFLAGS="$CFLAGS -DCURLAVAILABLE"
  fi