Changes in configure [ad66dcd:a7baf40]

File:

• configure (modified) (11 diffs)

configure

@@ -15 +15 @@
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
-libdir='$prefix/lib/'
 plugindir='$prefix/lib/bitlbee/'
 includedir='$prefix/include/bitlbee/'
@@ -40 +39 @@
 purple=0
 
-verbose=0
 doc=1
 debug=0
-strip=0
+strip=1
 gcov=0
 asan=0
@@ -127 +125 @@
 --pidfile=...                                           $pidfile
 --config=...                                            $config
-
---verbose=0/1   Disable/enable verbose build            $verbose
 
 --msn=0/1       Disable/enable MSN part                 $msn
@@ -174 +170 @@
 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')
 includedir=$(eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g')
@@ -198 +193 @@
 PLUGINDIR=$plugindir
 CONFIG=$config
-LIBDIR=$libdir
 INCLUDEDIR=$includedir
 PCDIR=$pcdir
@@ -247 +241 @@
 #define VARDIR "$datadir"
 #define PLUGINDIR "$plugindir"
-#define DATADIR "$datadir"
 #define PIDFILE "$pidfile"
 #define IPCSOCKET "$ipcsocket"
@@ -290 +283 @@
 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="-g -O2 -fno-strict-aliasing"
+        [ -z "$CFLAGS" ] && CFLAGS="-O2 -fno-strict-aliasing"
 fi
 
@@ -771 +745 @@
 if [ "$doc" = "1" ]; then
         # check this here just in case someone tries to install it in python2.4...
-        if [ ! -e $srcdir/doc/user-guide/help.txt ] && ! $PYTHON -m xml.etree.ElementTree > /dev/null 2>&1; then
+        if ! $PYTHON -m xml.etree.ElementTree > /dev/null 2>&1; then
                 echo
                 echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs'
@@ -804 +778 @@
 fi
 
-pkgconfiglibs=''
-case "$arch" in
-CYGWIN* )
-        pkgconfiglibs='-L${libdir} -lbitlbee -no-undefined'
-esac
-
 cat <<EOF >bitlbee.pc
 prefix=$prefix
 includedir=$includedir
 plugindir=$plugindir
-libdir=$libdir
-datadir=$datadir
 
 Name: bitlbee
@@ -821 +787 @@
 Requires: glib-2.0
 Version: $BITLBEE_VERSION
-Libs: $pkgconfiglibs
+Libs:
 Cflags: -I\${includedir}
 
@@ -931 +897 @@
 ;;
 CYGWIN* )
-        echo 'EFLAGS+=-Wl,--export-all,--out-implib,libbitlbee.dll.a' >> Makefile.settings
-        echo 'IMPLIB=libbitlbee.dll.a' >> Makefile.settings
 ;;
 Windows )