Merge branch 'master' of feistymeow.org:feisty_meow

diff --git a/database/fortunes.dat b/database/fortunes.dat
index a3fc2bb67183b1295ef3000fc54c150b9f82f576..11b2fbb4f0dc367461f13b1831c641521dbb4cd0 100644 (file)
--- a/database/fortunes.dat
+++ b/database/fortunes.dat
@@ -39519,3 +39519,22 @@ involves eradicating those stains that are eliminated through cultivation.
   -- from "Distinguishing Phenomena from Their Intrinsic Nature: Maitreya's
      Dharmadharmatavibhanga with Commentaries by Khenpo Shenga and Ju Mipham",
      Shambhala Publications.
+~
+  The Capable One spoke of the following attributes as the seven noble riches,
+for they are the causes of untainted happiness and are not in any way
+ordinary.  Faith—that is, the three kinds of faith in the Three Jewels and
+confidence in the law of actions and their effects.  Discipline, the avoidance
+of harmful actions.  Learning that comes from listening to the holy Dharma
+that leads to liberation, with the intention of gaining complete knowledge.
+Being generous—with a desire to make offerings and to help beings, to give
+away all one’s possessions without expecting anything in return or any
+karmic reward.  A sense of shame with respect to oneself that prevents one
+from indulging in negative actions, and that is unstained by such things as
+jealousy or seeking veneration.  A sense of decency with regard to others that
+stops one from engaging in unvirtuous practices.  And wisdom, that is,
+knowledge of the particular and general characteristics of phenomena.
+  You should realize that other common things that the world calls
+riches—gold, for instance—are of no value in obtaining untainted
+qualities; they are worthless, hollow, and without essence.
+  -- from "Nagarjuna’s Letter to a Friend With Commentary by Kyabje Kangyur
+     Rinpoche", Shambhala Publications

diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def
index aea2b4a056dbc6996ce9e298e04e6dd1e750b803..6e5651627c0300dda0b5e107906332b3534162ca 100644 (file)
--- a/scripts/clam/cpp/rules.def
+++ b/scripts/clam/cpp/rules.def
@@ -65,7 +65,7 @@ LIBS_USED += Xmu
 
   ifneq "$(USE_CURL)" ""
     COMPILER_FLAGS += `curl-config --cflags`
-    LOAD_FLAG_SUFFIX += `curl-config --static-libs`
+    LOAD_FLAG_SUFFIX += `curl-config --libs`
   endif
 
 endif