xforms.patch 3.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158
  1. --- Imakefile.dist Thu Feb 20 15:00:08 2003
  2. +++ Imakefile Thu Feb 20 16:42:03 2003
  3. @@ -2,13 +2,13 @@
  4. /* Fairly important stuff */
  5. -#define OptimizationLevel -O4
  6. +#define OptimizationLevel -O2
  7. #define DoWall NO
  8. -#define BuildShared YES
  9. +#define BuildShared NO
  10. #define StaticLink YES
  11. -#define BuildGL YES
  12. +#define BuildGL NO
  13. /* Less Important or System Specific */
  14. @@ -32,23 +32,23 @@
  15. /* Out in the Tall Weeds */
  16. -#define InstallNonstandard NO
  17. -#define XFormsNonstandardInstallDir /usr/local
  18. +#define InstallNonstandard YES
  19. +#define XFormsNonstandardInstallDir @l_prefix@
  20. -#define NonstandardXpm NO
  21. +#define NonstandardXpm YES
  22. -#define XpmIncLoc /usr/local/include
  23. -#define XpmLibLoc /usr/local/lib
  24. +#define XpmIncLoc @l_prefix@/include/X11
  25. +#define XpmLibLoc @l_prefix@/lib
  26. -#define NonstandardTiff NO
  27. +#define NonstandardTiff YES
  28. -#define TiffIncLoc /usr/local/include
  29. -#define TiffLibLoc /usr/local/lib
  30. +#define TiffIncLoc @l_prefix@/include
  31. +#define TiffLibLoc @l_prefix@/lib
  32. -#define NonstandardJpeg NO
  33. +#define NonstandardJpeg YES
  34. -#define JpegIncLoc /usr/local/include
  35. -#define JpegLibLoc /usr/local/lib
  36. +#define JpegIncLoc @l_prefix@/include
  37. +#define JpegLibLoc @l_prefix@/lib
  38. ######################################################################
  39. # #
  40. --- demos/Imakefile.dist Thu Feb 20 15:26:40 2003
  41. +++ demos/Imakefile Thu Feb 20 16:42:09 2003
  42. @@ -154,7 +154,7 @@
  43. -I.
  44. DEPEND_DEFINES = \
  45. - -I/usr/local/include
  46. + -I@l_prefix@/include
  47. EXTRA_LIBRARIES = \
  48. $(STATIC) \
  49. @@ -176,7 +176,7 @@
  50. #if Optimize
  51. IMAKE_OPTIMIZE = -DDoOptimize=1
  52. -OPTIMIZER = -O4
  53. +OPTIMIZER = -O2
  54. #else
  55. OPTIMIZER =
  56. #endif
  57. --- fd2ps/Imakefile.dist Thu Feb 20 15:26:40 2003
  58. +++ fd2ps/Imakefile Thu Feb 20 16:41:52 2003
  59. @@ -64,7 +64,7 @@
  60. -I.
  61. DEPEND_DEFINES = \
  62. - -I/usr/local/include
  63. + -I@l_prefix@/include
  64. EXTRA_LIBRARIES = \
  65. $(STATIC) \
  66. @@ -83,7 +83,7 @@
  67. CDEBUGFLAGS = -g $(OPTIMIZER)
  68. #if Optimize
  69. IMAKE_OPTIMIZE = -DDoOptimize=1
  70. -OPTIMIZER = -O4
  71. +OPTIMIZER = -O2
  72. #else
  73. OPTIMIZER =
  74. #endif
  75. --- fdesign/Imakefile.dist Thu Feb 20 15:26:40 2003
  76. +++ fdesign/Imakefile Thu Feb 20 15:27:27 2003
  77. @@ -99,7 +99,7 @@
  78. -I.
  79. DEPEND_DEFINES = \
  80. - -I/usr/local/include
  81. + -I@l_prefix@/include
  82. EXTRA_LIBRARIES = \
  83. --- gl/Imakefile.dist Thu Feb 20 15:26:40 2003
  84. +++ gl/Imakefile Thu Feb 20 15:28:52 2003
  85. @@ -44,7 +44,7 @@
  86. REQUIREDLIBS = \
  87. $(LDPRELIB) \
  88. $(XLIB) \
  89. - -L/usr/local/lib \
  90. + -L@l_prefix@/lib \
  91. -L../lib -lforms \
  92. -lGL \
  93. $(LGCC)
  94. @@ -56,7 +56,7 @@
  95. -I.
  96. DEPEND_DEFINES = \
  97. - -I/usr/local/include
  98. + -I@l_prefix@/include
  99. EXTRA_DEFINES = \
  100. -DMAKING_FORMS \
  101. --- image/Imakefile.dist Thu Feb 20 15:41:45 2003
  102. +++ image/Imakefile Thu Feb 20 15:28:08 2003
  103. @@ -88,7 +88,7 @@
  104. -I.
  105. DEPEND_DEFINES = \
  106. - -I/usr/local/include
  107. + -I@l_prefix@/include
  108. EXTRA_DEFINES = \
  109. $(HAVE_STRERROR )
  110. @@ -121,7 +121,8 @@
  111. REQUIREDLIBS = \
  112. $(LDPRELIB) \
  113. $(XLIB) \
  114. - -L/usr/local/lib \
  115. + $(LDFLAGS) \
  116. + -L@l_prefix@/lib \
  117. -L../lib -lforms \
  118. $(JPEGLIBDIR) -ljpeg \
  119. $(TIFFLIBDIR) -ltiff \
  120. --- lib/Imakefile.dist Thu Feb 20 15:02:58 2003
  121. +++ lib/Imakefile Thu Feb 20 15:03:08 2003
  122. @@ -128,7 +128,7 @@
  123. -Ifd
  124. DEPEND_DEFINES = \
  125. - -I/usr/local/include
  126. + -I@l_prefix@/include
  127. #if !BuildGL
  128. NO_GL = -DNO_GL