Changeset 89db90e for configure

Timestamp:

2015-03-12T09:10:16Z (9 years ago)

Author:

dequis <dx@…>

Children:

fc650a8

Parents:

0e4c3dd (diff), 3bb333c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

File:

• configure (modified) (8 diffs)

configure

@@ -37 +37 @@
 purple=0
 
+doc=1
 debug=0
 strip=1
@@ -59 +60 @@
 # Cygwin and Darwin don't support PIC/PIE
 case "$arch" in
-    CYGWIN* )
-        pie=0;;
-    Darwin )
-        pie=0;;
+        CYGWIN* )
+                pie=0;;
+        Darwin )
+                pie=0;;
 esac
 
@@ -94 +95 @@
                 (automatically disables other protocol modules)
 
+--doc=0/1       Disable/enable help.txt generation      $doc
 --debug=0/1     Disable/enable debugging                $debug
 --strip=0/1     Disable/enable binary stripping         $strip
@@ -448 +450 @@
         ret=1
         echo "$RESOLV_NS_TESTCODE" | $CC -o $TMPFILE -x c - $LIBRESOLV >/dev/null 2>/dev/null
-        if [ "$?" = "0" ]; then
-                ret=0
-        fi
+        if [ "$?" = "0" ]; then
+                ret=0
+        fi
 
         rm -f $TMPFILE
@@ -463 +465 @@
                 if [ -f $i/libresolv.a ]; then
                         echo "$RESOLV_NS_TESTCODE" | $CC -o $TMPFILE -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
-                        if [ "$?" = "0" ]; then
-                                ret=0
-                        fi
+                        if [ "$?" = "0" ]; then
+                                ret=0
+                        fi
                 fi
         done
@@ -475 +477 @@
 detect_nameser_has_ns_types()
 {
-    TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
-    ret=1
-    # since we aren't actually linking with ns_* routines
-    # we can just compile the test code
-    echo "$RESOLV_NS_TYPES_TESTCODE" | $CC -o $TMPFILE -x c -  >/dev/null 2>/dev/null
-    if [ "$?" = "0" ]; then
-        ret=0
-    fi
-
-    rm -f $TMPFILE
-    return $ret
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
+        ret=1
+        # since we aren't actually linking with ns_* routines
+        # we can just compile the test code
+        echo "$RESOLV_NS_TYPES_TESTCODE" | $CC -o $TMPFILE -x c -  >/dev/null 2>/dev/null
+        if [ "$?" = "0" ]; then
+                ret=0
+        fi
+
+        rm -f $TMPFILE
+        return $ret
 }
 
@@ -546 +548 @@
 if detect_resolv_dynamic || detect_resolv_static; then
         echo '#define HAVE_RESOLV_A' >> config.h
-    if detect_resolv_ns_dynamic || detect_resolv_ns_static; then
-            echo '#define HAVE_RESOLV_A_WITH_NS' >> config.h
-    fi
-else
-    echo 'Insufficient resolv routines. Jabber server must be set explicitly'
+        if detect_resolv_ns_dynamic || detect_resolv_ns_static; then
+                echo '#define HAVE_RESOLV_A_WITH_NS' >> config.h
+        fi
+else
+        echo 'Insufficient resolv routines. Jabber server must be set explicitly'
 fi
 
@@ -647 +649 @@
 fi
 
-if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
-        echo
-        echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
-        echo 'Install xmlto if you want online help to work.'
+if [ "$doc" = "1" ]; then
+        if [ ! -e doc/user-guide/help.txt ] && \
+             ! type xmlto > /dev/null 2> /dev/null || \
+             ! type xsltproc > /dev/null 2> /dev/null
+        then
+                echo
+                echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
+                echo 'Install xmlto and xsltproc if you want online help to work.'
+        else
+                echo "DOC=1" >> Makefile.settings
+        fi
+
+        if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
+                # skype also needs asciidoc
+                if ! type a2x > /dev/null 2> /dev/null; then
+                        echo
+                        echo 'WARNING: The skyped man page requires asciidoc. It will not be generated.'
+                else
+                        echo "ASCIIDOC=1" >> Makefile.settings
+                fi
+        fi
 fi