Changeset 574af7e for configure


Ignore:
Timestamp:
2006-05-25T23:20:54Z (15 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
79b6213
Parents:
5d9b792
Message:

Require GLib 2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r5d9b792 r574af7e  
    163163fi
    164164
    165 GLIB=0
    166 
    167165if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
    168166        cat<<EOF>>Makefile.settings
     
    170168CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
    171169EOF
    172         echo '#define GLIB2' >> config.h
    173         GLIB=2
    174 elif type glib-config > /dev/null 2> /dev/null; then
    175         cat<<EOF>>Makefile.settings
    176 EFLAGS+=`glib-config --libs`
    177 CFLAGS+=`glib-config --cflags`
    178 EOF
    179         echo '#define GLIB1' >> config.h
    180         GLIB=1
    181 else
    182         echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
     170else
     171        echo 'Cannot find glib2 development libraries, aborting. (Install libglib2-dev?)'
    183172        exit 1;
    184173fi
    185 
    186 if [ GLIB = 1 -o -r /usr/include/iconv.h ]; then
    187         :;
    188 elif [ -r /usr/local/include/iconv.h ]; then
    189         echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
    190 else
    191         echo
    192         echo 'Warning: Could not find iconv.h, you might have to install it and/or modify'
    193         echo 'Makefile.settings to tell where this file is.';
    194 fi
    195 
    196174
    197175detect_gnutls()
     
    390368;;
    391369*BSD )
    392         echo 'EFLAGS+=-liconv' >> Makefile.settings;
     370;;
     371Darwin )
     372;;
     373IRIX )
    393374;;
    394375SunOS )
    395376        echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
    396377        echo 'STRIP=\# skip strip' >> Makefile.settings
    397         echo 'EFLAGS+=-liconv' >> Makefile.settings;
    398 ;;
    399 Darwin )
    400         echo 'EFLAGS+=-liconv' >> Makefile.settings;
    401 ;;
    402 IRIX )
    403378;;
    404379CYGWIN* )
Note: See TracChangeset for help on using the changeset viewer.