Changeset 7a9d968 for configure

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (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 'master' into HEAD

File:

• configure (modified) (12 diffs)

configure

@@ -15 +15 @@
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
+libdir='$prefix/lib/'
 plugindir='$prefix/lib/bitlbee/'
 rpcplugindir='$plugindir/rpc/'
@@ -41 +42 @@
 rpc=1
 
+verbose=0
 doc=1
 debug=0
-strip=1
+strip=0
 gcov=0
 asan=0
@@ -129 +131 @@
 --config=...                                            $config
 
+--verbose=0/1   Disable/enable verbose build            $verbose
+
 --msn=0/1       Disable/enable MSN part                 $msn
 --jabber=0/1    Disable/enable Jabber part              $jabber
@@ -174 +178 @@
 datadir=$(eval echo "$datadir/" | sed 's/\/\{1,\}/\//g')
 config=$(eval echo "$config/" | sed 's/\/\{1,\}/\//g')
+libdir=$(eval echo "$libdir/" | sed 's/\/\{1,\}/\//g')
 plugindir=$(eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g')
 rpcplugindir=$(eval echo "$rpcplugindir/" | sed 's/\/\{1,\}/\//g')
@@ -199 +204 @@
 RPCPLUGINDIR=$rpcplugindir
 CONFIG=$config
+LIBDIR=$libdir
 INCLUDEDIR=$includedir
 PCDIR=$pcdir
@@ -248 +254 @@
 #define PLUGINDIR "$plugindir"
 #define RPCPLUGINDIR "$rpcplugindir"
+#define DATADIR "$datadir"
 #define PIDFILE "$pidfile"
 #define IPCSOCKET "$ipcsocket"
@@ -296 +303 @@
 fi
 
+if [ "$verbose" = "0" ]; then
+        echo 'VERBOSE=@' >> Makefile.settings
+else
+        echo 'VERBOSE=' >> Makefile.settings
+fi
+
+cat <<EOF >>Makefile.settings
+
+# Enable/disable output verbosity
+ifdef V
+ifeq (\$(V),1)
+        VERBOSE=
+else
+        VERBOSE=@
+endif
+endif
+
+EOF
+
 if [ "$debug" = "1" ]; then
         echo 'DEBUG=1' >> Makefile.settings
         CFLAGS="$CFLAGS -g3 -DDEBUG -O0"
 else
-        [ -z "$CFLAGS" ] && CFLAGS="-O2 -fno-strict-aliasing"
+        [ -z "$CFLAGS" ] && CFLAGS="-g -O2 -fno-strict-aliasing"
 fi
 
@@ -764 +790 @@
 if [ "$doc" = "1" ]; then
         # check this here just in case someone tries to install it in python2.4...
-        if ! $PYTHON -m xml.etree.ElementTree > /dev/null 2>&1; then
+        if [ ! -e $srcdir/doc/user-guide/help.txt ] && ! $PYTHON -m xml.etree.ElementTree > /dev/null 2>&1; then
                 echo
                 echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs'
@@ -797 +823 @@
 fi
 
+pkgconfiglibs=''
+case "$arch" in
+CYGWIN* )
+        pkgconfiglibs='-L${libdir} -lbitlbee -no-undefined'
+esac
+
 cat <<EOF >bitlbee.pc
 prefix=$prefix
@@ -802 +834 @@
 plugindir=$plugindir
 rpcplugindir=$rpcplugindir
+libdir=$libdir
+datadir=$datadir
 
 Name: bitlbee
@@ -807 +841 @@
 Requires: glib-2.0
 Version: $BITLBEE_VERSION
-Libs:
+Libs: $pkgconfiglibs
 Cflags: -I\${includedir}
 
@@ -925 +959 @@
 ;;
 CYGWIN* )
+        echo 'EFLAGS+=-Wl,--export-all,--out-implib,libbitlbee.dll.a' >> Makefile.settings
+        echo 'IMPLIB=libbitlbee.dll.a' >> Makefile.settings
 ;;
 Windows )