Changeset 185

Timestamp:

Apr 3, 2006, 6:36:54 PM (16 years ago)

Author:

titer

Message:

Adds Makefile for GTK interface

Location:

branches/compat-10.2

Files:

• Jamfile (deleted)
• Jamrules (deleted)
• Makefile (modified) (2 diffs)
• Makefile.common (modified) (1 diff)
• configure.make (modified) (7 diffs)
• gtk/Jamfile (deleted)
• gtk/Makefile (added)
• libtransmission/Jamfile (deleted)

branches/compat-10.2/Makefile

@@ -9 +9 @@
 CFLAGS += -Ilibtransmission
 
-all: transmissioncli
+all: transmissioncli transmission-gtk
+
+lib:
+        $(MAKE) -C libtransmission
 
 transmissioncli: lib $(OBJS)
         $(CC) -o $@ $(OBJS) libtransmission/libtransmission.a $(LDFLAGS)
 
-lib:
-        $(MAKE) -C libtransmission
+transmission-gtk:
+        $(MAKE) -C gtk
 
 %.o: %.c Makefile.config Makefile.common Makefile
@@ -23 +26 @@
         $(RM) transmissioncli $(OBJS)
         $(MAKE) -C libtransmission clean
+        $(MAKE) -C gtk clean
 
 .depend: $(SRCS) Makefile

branches/compat-10.2/Makefile.common

@@ -23 +23 @@
 endif
 
-ifeq ($(MATH),yes)
-LDFLAGS += -lm
-endif
-
 ifeq ($(PTHREAD),yes)
 ifeq ($(SYSTEM),FreeBSD)

branches/compat-10.2/configure.make

@@ -9 +9 @@
 PTHREAD=no
 OPENSSL=
+GTK=
+PREFIX=/usr/local
 CC="${CC-cc}"
 CFLAGS="${CFLAGS}"
@@ -23 +25 @@
 Options:
   --disable-openssl      Disable OpenSSL, use built-in SHA1 implementation
+  --disable-gtk          Don't build the GTK+ GUI
+  --prefix=PATH          Installation path
 
 Some influential environment variables:
@@ -53 +57 @@
 }
 
+lm_test()
+{
+  cat > testconf.c << EOF
+  int main()
+  {
+    return cos( 42 );
+  }
+EOF
+  if ! $CC -o testconf testconf.c > /dev/null 2>&1
+  then
+    if $CC -o testconf testconf.c -lm > /dev/null 2>&1
+    then
+      LDFLAGS="$LDFLAGS -lm"
+    fi
+  fi
+  rm -f testconf.c testconf
+}
+
+lrintf_test()
+{
+  cat > testconf.c << EOF
+  int main()
+  {
+    return ( lrintf( 3.14 ) != 3 );
+  }
+EOF
+  if ( $CC -o testconf testconf.c $LINKLIBS && ./testconf ) > /dev/null 2>&1
+  then
+    CFLAGS="$CFLAGS -DHAVE_LRINTF"
+  fi
+  rm -f testconf.c testconf
+}
+
+gettext_test()
+{
+  cat > testconf.c <<EOF
+  #include <libintl.h>
+  int main()
+  {
+    gettext("");
+  }
+EOF
+
+  if $CC $CFLAGS_GTK $LDFLAGS_GTK -o testconf testconf.c > /dev/null 2>&1
+  then
+    rm -f testconf.c testconf
+    return 0
+  fi
+
+  for intl_testdir in $PREFIX/include \
+      /usr/local/include /usr/X11R6/include /usr/pkg/include
+  do
+    if $CC $CFLAGS_GTK -I$intl_testdir $LDFLAGS_GTK -o testconf testconf.c > /dev/null 2>&1
+    then
+      CFLAGS_GTK="CFLAGS_GTK -I$intl_testdir"
+      rm -f testconf.c testconf
+      return 0
+    fi
+  done
+  rm -f testconf.c testconf
+  return 1
+}
+
+gtk_test()
+{
+  if pkg-config gtk+-2.0 > /dev/null 2>&1
+  then
+    if expr `pkg-config --modversion gtk+-2.0` '>=' 2.6.0 > /dev/null 2>&1
+    then
+      cat > testconf.c << EOF
+      #include <gtk/gtk.h>
+      int main()
+      {
+        gtk_main();
+      }
+EOF
+      if $CC `pkg-config gtk+-2.0 --cflags --libs` -o testconf testconf.c > /dev/null 2>&1
+      then
+        CFLAGS_GTK=`pkg-config gtk+-2.0 --cflags`
+        LDFLAGS_GTK=`pkg-config gtk+-2.0 --libs`
+        if gettext_test
+        then
+          echo "yes"
+          GTK=yes
+          GTKLOCALEDIR="$PREFIX/share/locale"
+        else
+          echo "no (could not find gettext libintl.h)"
+          GTK=no
+        fi
+      else
+        echo "no"
+        GTK=no
+      fi
+      rm -f testconf.c testconf
+    else
+      echo "no (2.6.0 or later is required)"
+      GTK=no
+    fi
+  else
+    echo "no"
+    GTK=no
+  fi
+}
 
 #
@@ -63 +170 @@
     x--disable-openssl)
       OPENSSL=no
+      ;;
+    x--disable-gtk)
+      GTK=no
       ;;
     x--help)
@@ -109 +219 @@
 
   FreeBSD|NetBSD|OpenBSD|Linux)
-    MATH=yes
     PTHREAD=yes
     ;;
@@ -130 +239 @@
 
 #
+# GTK+ settings
+#
+echo -n "GTK+:    "
+if [ "$GTK" = no ]; then
+  echo "disabled"
+else
+  gtk_test
+fi
+if [ "$GTK" = yes ]; then
+  rm -f gtk/defines.h
+  cat > gtk/defines.h << EOF
+#ifndef TG_DEFINES_H
+#define TG_DEFINES_H
+#define LOCALEDIR               "$GTKLOCALEDIR"
+#endif
+EOF
+fi
+
+#
+# Math functions
+#
+lm_test
+lrintf_test
+
+#
 # Generate Makefile.config
 #
@@ -136 +270 @@
 SYSTEM         = $SYSTEM
 BEOS_NETSERVER = $BEOS_NETSERVER
-MATH           = $MATH
 PTHREAD        = $PTHREAD
 OPENSSL        = $OPENSSL
+GTK            = $GTK
 CC             = $CC
 CFLAGS         = $CFLAGS
 LDFLAGS        = $LDFLAGS
+CFLAGS_GTK     = $CFLAGS_GTK
+LDFLAGS_GTK    = $LDFLAGS_GTK
 EOF