Changeset 580

Timestamp:

05/13/13 13:35:26 (8 years ago)

Author:

dennis

Message:

Adjusted the xmlrpc-c.rul file to include the correct curl version, closes #69

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• VERSION (modified) (1 diff)
• configure (modified) (11 diffs)
• initrd/make.d/xmlrpc-c.rul (modified) (1 diff)

trunk/CHANGELOG

@@ +1 @@
+1.6.1
+  * Due to strange configure behaviour of xmlrpc-c adjusted the xmlrpc-c.rul
+    to ensure that the correct curl version is used. Closes bug #69.
+    Author: Dennis Stam
+
 1.6.0
   * Rewrote /init script as a lot has changed with udev since version 166

trunk/VERSION

@@ -1 @@
-1.6.0
+1.6.1

trunk/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for SALI 1.6.0.
+# Generated by GNU Autoconf 2.69 for SALI 1.6.1.
 #
-# Report bugs to <sali@sara.nl>.
+# Report bugs to <sali@surfsara.nl>.
 #
 #
@@ -266 +266 @@
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and sali@sara.nl about
-$0: your system, including any error possibly output before
-$0: this message. Then install a modern shell, or manually
-$0: run the script under such a shell if you do have one."
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and sali@surfsara.nl
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
   fi
   exit 1
@@ -579 +580 @@
 PACKAGE_NAME='SALI'
 PACKAGE_TARNAME='sali'
-PACKAGE_VERSION='1.6.0'
-PACKAGE_STRING='SALI 1.6.0'
-PACKAGE_BUGREPORT='sali@sara.nl'
+PACKAGE_VERSION='1.6.1'
+PACKAGE_STRING='SALI 1.6.1'
+PACKAGE_BUGREPORT='sali@surfsara.nl'
 PACKAGE_URL=''
 
@@ -1203 +1204 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures SALI 1.6.0 to adapt to many kinds of systems.
+\`configure' configures SALI 1.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1264 +1265 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of SALI 1.6.0:";;
+     short | recursive ) echo "Configuration of SALI 1.6.1:";;
    esac
   cat <<\_ACEOF
@@ -1283 +1284 @@
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <sali@sara.nl>.
+Report bugs to <sali@surfsara.nl>.
 _ACEOF
 ac_status=$?
@@ -1346 +1347 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-SALI configure 1.6.0
+SALI configure 1.6.1
 generated by GNU Autoconf 2.69
 
@@ -1476 +1477 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by SALI $as_me 1.6.0, which was
+It was created by SALI $as_me 1.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -3792 +3793 @@
 # values after options handling.
 ac_log="
-This file was extended by SALI $as_me 1.6.0, which was
+This file was extended by SALI $as_me 1.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -3839 +3840 @@
 $config_files
 
-Report bugs to <sali@sara.nl>."
+Report bugs to <sali@surfsara.nl>."
 
 _ACEOF
@@ -3845 +3846 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-SALI config.status 1.6.0
+SALI config.status 1.6.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

trunk/initrd/make.d/xmlrpc-c.rul

@@ -23 +23 @@
 
 $(XMLRPC_DIR).build: $(OPENSSL_DIR).build $(XMLRPC_DIR).get
-        cd $(XMLRPC_DIR) && ./configure  --disable-libwww-client --disable-abyss-threads --disable-cplusplus --disable-cgi-server--disable-abyss-server --enable-tools --prefix=/usr && make
+        cd $(XMLRPC_DIR) && PATH="$${PATH}:$(INITRD_BUILD_DIR)/usr/bin" CFLAGS="-I$(INITRD_BUILD_DIR)/usr/include" ./configure  --disable-libwww-client --disable-abyss-threads --disable-cplusplus --disable-cgi-server--disable-abyss-server --enable-tools --prefix=/usr
+
+        cd $(XMLRPC_DIR) && PATH="$${PATH}:$(INITRD_BUILD_DIR)/usr/bin" CFLAGS="-I$(INITRD_BUILD_DIR)/usr/include" LIBRARY_PATH=$(INITRD_BUILD_DIR)/usr/lib make
 
         touch $@