Changeset 5 for trunk/configure

Timestamp:

Jan 12, 2006, 6:32:29 PM (16 years ago)

Author:

root

Message:

Update 2005-11-18

File:

• trunk/configure (modified) (6 diffs)

trunk/configure

@@ -11 +11 @@
     --disable-openssl      Disable OpenSSL, use built-in SHA1 implementation
     --openssl-prefix=PATH  Location of OpenSSL headers and library
+    --disable-gtk          Don't build the GTK+ GUI
 
   Some influential environment variables:
@@ -43 +44 @@
 }
 
+gtk_test()
+{
+  cat > testconf.c << EOF
+  #include <gtk/gtk.h>
+  int main()
+  {
+    gtk_main();
+  }
+EOF
+  if $CC `pkg-config gtk+-2.0 --cflags --libs 2>/dev/null` -o testconf testconf.c
+  then
+    echo "GTK+: yes"
+    GTK=yes
+    GTKCCFLAGS=`pkg-config gtk+-2.0 --cflags`
+    GTKLINKLIBS=`pkg-config gtk+-2.0 --libs`
+  else
+    echo "GTK+: no"
+    GTK=no
+  fi
+  rm -f testconf.c testconf
+}
+
 #
 # Defaults settings
@@ -53 +76 @@
 DEFINES="$DEFINES _GNU_SOURCE"
 openssl_disable=0
+gtk_disable=0
+GTK=no
+GTKCCFLAGS=
+GTKLINKLIBS=
 
 #
@@ -66 +93 @@
     x--openssl-prefix=*)
       OPENSSL_PREFIX="$param";
+      ;;
+    x--disable-gtk)
+      gtk_disable="1";
       ;;
     x--help)
@@ -126 +156 @@
 echo "System:  $SYSTEM"
 
+# Check for GTK
+if pkg-config gtk+-2.0
+then
+    echo "GTK+: yes"
+    GTK=yes
+    GTKCCFLAGS=`pkg-config gtk+-2.0 --cflags`
+    GTKLINKLIBS=`pkg-config gtk+-2.0 --libs`
+else
+    echo "GTK+: no"
+    GTK=no
+fi
+
 #
 # OpenSSL settings
@@ -136 +178 @@
 
 #
+# GTK settings
+#
+if [ ${gtk_disable} = 1 ]; then
+  echo "GTK+: no"
+else
+    gtk_test
+fi
+
+#
 # Generate config.jam
 #
 rm -f config.jam
 cat > config.jam << EOF
-CC         = $CC ;
-LINK       = $CC ;
-CCFLAGS    = $CFLAGS ;
-DEFINES    = $DEFINES ;
-LINKLIBS   = $LINKLIBS ;
+CC          = $CC ;
+LINK        = $CC ;
+CCFLAGS     = $CFLAGS ;
+DEFINES     = $DEFINES ;
+LINKLIBS    = $LINKLIBS ;
+GTK         = $GTK ;
+GTKCCFLAGS  = $GTKCCFLAGS ;
+GTKLINKLIBS = $GTKLINKLIBS ;
 EOF
 if [ -n "$OPENSSL_PREFIX" ]; then
 cat >> config.jam << EOF
-HDRS      += $OPENSSL_PREFIX/include ;
-LINKFLAGS += -L$OPENSSL_PREFIX/lib ;
+HDRS       += $OPENSSL_PREFIX/include ;
+LINKFLAGS  += -L$OPENSSL_PREFIX/lib ;
 EOF
 fi