API tools faq
paste
Advertisement
dominus

Untitled

dominus
Sep 3rd, 2023
1,256
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 18.30 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/configure.ac b/configure.ac
  2. index 85559d7f7..bf77c919f 100644
  3. --- a/configure.ac
  4. +++ b/configure.ac
  5. @@ -428,20 +428,6 @@ if test x$enable_android_apk = xno -a x$enable_exult = xyes; then
  6.     PKG_CHECK_MODULES(OGG, ogg >= 1.0 vorbis >= 1.0.1 vorbisfile, , AC_MSG_ERROR([*** must have Ogg/Vorbis installed!]))
  7.  fi
  8.  
  9. -# ---------------------------------------------------------------------
  10. -# Icu (for ES)
  11. -# ---------------------------------------------------------------------
  12. -
  13. -if test x$enable_android_apk = xno; then
  14. -   PKG_CHECK_MODULES(ICU, icu-uc, have_icu=yes, have_icu=no)
  15. -fi
  16. -
  17. -# ---------------------------------------------------------------------
  18. -# Gtk (for ES)
  19. -# ---------------------------------------------------------------------
  20. -
  21. -PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.16, have_gtk=yes, have_gtk=no)
  22. -
  23.  # ---------------------------------------------------------------------
  24.  # Gdk-Pixbuf (for Gnome shp thumbnailer)
  25.  # ---------------------------------------------------------------------
  26. @@ -589,7 +575,6 @@ fi
  27.  
  28.  
  29.  # zipped savegame support
  30. -
  31.  AC_ARG_ENABLE(zip-support, AS_HELP_STRING([--enable-zip-support], [Enable zipped savegame support @<:@default yes@:>@]),,enable_zip_support=yes)
  32.  
  33.  if test x$enable_zip_support = xyes ; then
  34. @@ -668,7 +653,6 @@ else
  35.  fi
  36.  
  37.  # Midi Sfx
  38. -
  39.  AC_ARG_ENABLE(midi-sfx, AS_HELP_STRING([--enable-midi-sfx], [Support for Midi Sfx (sounds horrible) @<:@default no@:>@]),,enable_midi_sfx=no)
  40.  AC_MSG_CHECKING([whether to enable midi sfx])
  41.  if test x$enable_midi_sfx = xyes; then
  42. @@ -679,8 +663,63 @@ else
  43.  fi
  44.  
  45.  # ---------------------------------------------------------------------
  46. -# support for Exult Studio
  47. +# Exult Studio
  48.  # ---------------------------------------------------------------------
  49. +
  50. +AC_ARG_ENABLE(exult-studio, AS_HELP_STRING([--enable-exult-studio], [Build Exult Studio @<:@default no@:>@]),,enable_exult_studio=no)
  51. +AC_MSG_CHECKING([whether to build Exult Studio])
  52. +
  53. +if test x$enable_android_apk = xyes; then
  54. +   enable_exult_studio=no
  55. +fi
  56. +
  57. +# library dependencies
  58. +if test x$enable_exult_studio = xyes; then
  59. +# Icu
  60. +   PKG_CHECK_MODULES(ICU, icu-uc, have_icu=yes, have_icu=no)
  61. +# Gtk
  62. +   PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.16, have_gtk=yes, have_gtk=no)
  63. +# Freetype2 (optional, used in ExultStudio, shapes/fontgen.cc)
  64. +   AC_PATH_PROG(FT2CONFIG, freetype-config)
  65. +   if test -n "$FT2CONFIG"; then
  66. +       FREETYPE2_LIBS=`$FT2CONFIG --libs`
  67. +       SAVED_LDFLAGS="$LDFLAGS"
  68. +       LDFLAGS="$LDFLAGS $FREETYPE2_LIBS"
  69. +       AC_CHECK_FUNC(FT_Init_FreeType, have_freetype=yes, have_freetype=no)
  70. +       LDFLAGS="$SAVED_LDFLAGS"
  71. +       FREETYPE2_INCLUDES=`$FT2CONFIG --cflags`
  72. +       if test x$have_freetype = xyes; then
  73. +           AC_DEFINE(HAVE_FREETYPE2, 1, [Have freetype2])
  74. +       else
  75. +           FREETYPE2_LIBS=
  76. +           FREETYPE2_INCLUDES=
  77. +       fi
  78. +       AC_SUBST(FREETYPE2_LIBS)
  79. +       AC_SUBST(FREETYPE2_INCLUDES)
  80. +   fi
  81. +fi
  82. +
  83. +# Exult Studio
  84. +if test x$enable_exult_studio = xyes; then
  85. +   AC_MSG_RESULT(yes)
  86. +   if test x$have_gtk = xno; then
  87. +       echo "Exult Studio requires the GTK+ (aka the GIMP Tool Kit), but it is not installed."
  88. +       echo "Please try again, either with the GTK+ installed as 3.16 or newer, or with '--disable-exult-studio'."
  89. +       exit 1
  90. +   fi
  91. +   if test x$have_icu = xno; then
  92. +       echo "Exult Studio requires the ICU (aka the International Components for Unicode), but it is not installed."
  93. +       echo "Please try again, either with the ICU installed, or with '--disable-exult-studio'."
  94. +       exit 1
  95. +   fi
  96. +   AM_CONDITIONAL(BUILD_STUDIO, true)
  97. +   AM_CONDITIONAL(BUILD_SHAPES, true)
  98. +else
  99. +   AM_CONDITIONAL(BUILD_STUDIO, false)
  100. +   AC_MSG_RESULT(no)
  101. +fi
  102. +
  103. +# support for Exult Studio
  104.  AC_MSG_CHECKING([whether to enable support for Exult Studio])
  105.  AC_ARG_ENABLE(exult-studio-support, AS_HELP_STRING([--enable-exult-studio-support], [Enable ExultStudio support @<:@default no@:>@]),,enable_exult_studio_support=no)
  106.  if test "$WINDOWING_SYSTEM" != -DXWIN -a "$WINDOWING_SYSTEM" != -D_WIN32 -a "$WINDOWING_SYSTEM" != -DMACOSX; then
  107. @@ -692,6 +731,10 @@ if test "$WINDOWING_SYSTEM" != -DMACOSX; then
  108.     enable_macosx_x11_studio_support=no
  109.  fi
  110.  
  111. +if test x$enable_exult_studio = xyes; then
  112. +   enable_exult_studio_support=yes
  113. +fi
  114. +
  115.  if test x$enable_exult_studio_support = xyes ; then
  116.     AC_MSG_RESULT(yes)
  117.     AC_DEFINE(USE_EXULTSTUDIO, 1, [Use Exult Studio])
  118. @@ -719,6 +762,150 @@ else
  119.     AC_MSG_RESULT(no)
  120.  fi
  121.  
  122. +# --------------------
  123. +# External features
  124. +# --------------------
  125. +
  126. +# Build any external programs?
  127. +AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools], [Only build the main program]),,enable_tools=yes)
  128. +AC_MSG_CHECKING([whether to build only the main program])
  129. +if test x$enable_tools = xno; then
  130. +   AC_MSG_RESULT(yes)
  131. +   AM_CONDITIONAL(BUILD_TOOLS, false)
  132. +   enable_gimp_plugin=no
  133. +   enable_compiler=no
  134. +else
  135. +   AM_CONDITIONAL(BUILD_TOOLS, true)
  136. +   AC_MSG_RESULT(no)
  137. +fi
  138. +
  139. +# Build compiler?
  140. +AC_ARG_ENABLE(compiler, AS_HELP_STRING([--enable-compiler], [Build the usecode compiler @<:@default no@:>@]),,enable_compiler=no)
  141. +AC_MSG_CHECKING([whether to build the usecode compiler])
  142. +if test x$enable_compiler = xno; then
  143. +   AC_MSG_RESULT(no)
  144. +   AM_CONDITIONAL(BUILD_COMPILER, false)
  145. +else
  146. +   AC_MSG_RESULT(yes)
  147. +   AM_CONDITIONAL(BUILD_COMPILER, true)
  148. +fi
  149. +
  150. +# Build data files?
  151. +AC_ARG_ENABLE(data, AS_HELP_STRING([--enable-data], [Create the data files @<:@default yes@:>@]),,enable_data=yes)
  152. +AC_MSG_CHECKING([whether to build the data files])
  153. +if test x$enable_data = xno; then
  154. +   AC_MSG_RESULT(no)
  155. +   AM_CONDITIONAL(DATA_FILES, false)
  156. +else
  157. +   AM_CONDITIONAL(DATA_FILES, true)
  158. +   AC_MSG_RESULT(yes)
  159. +fi
  160. +
  161. +# Build mods?
  162. +AC_ARG_ENABLE(mods, AS_HELP_STRING([--enable-mods], [Build the Exult mods (requires usecode compiler) @<:@default no@:>@]),,enable_mods=no)
  163. +AC_MSG_CHECKING([whether to build the Exult mods])
  164. +if test x$enable_mods = xno -o x$enable_compiler = xno; then
  165. +   AC_MSG_RESULT(no)
  166. +   AM_CONDITIONAL(BUILD_MODS, false)
  167. +else
  168. +   AM_CONDITIONAL(BUILD_MODS, true)
  169. +   AC_MSG_RESULT(yes)
  170. +fi
  171. +
  172. +# Usecode debugger
  173. +AC_ARG_WITH([usecode-debugger],
  174. +            AS_HELP_STRING([--with-usecode-debugger=no|console|yes],
  175. +                           [Experimental and buggy support for usecode debugging @<:@default no@:>@]),
  176. +            [enable_usecode_debugger="$withval"], [enable_usecode_debugger="no"])
  177. +AC_MSG_CHECKING([whether to enable the usecode debugger])
  178. +if test x$enable_usecode_debugger = xconsole -o x$enable_usecode_debugger = xyes; then
  179. +   AC_MSG_RESULT(yes)
  180. +   if test x$enable_usecode_debugger = xconsole; then
  181. +       AC_DEFINE(USECODE_CONSOLE_DEBUGGER, 1, [Enable Usecode debugging on console])
  182. +   elif test x$enable_exult_studio != xyes; then
  183. +       echo "But we are not building Exult Studio."
  184. +       echo "Try again, either with --enable-exult-studio, or without the usecode debugger"
  185. +       exit 1
  186. +   elif test x$enable_exult_studio_support != xyes; then
  187. +       echo "But we are not building Exult with Exult Studio support."
  188. +       echo "Try again, either with --enable-exult-studio-support, or without the usecode debugger"
  189. +       exit 1
  190. +   fi
  191. +   AC_DEFINE(USECODE_DEBUGGER, 1, [Enable Usecode debugging])
  192. +else
  193. +   AC_MSG_RESULT(no)
  194. +fi
  195. +
  196. +# Usecode container
  197. +AC_ARG_ENABLE(usecode-container, AS_HELP_STRING([--enable-usecode-container], [Enable display of usecode container for debugging purposes @<:@default no@:>@]),,enable_usecode_container=no)
  198. +AC_MSG_CHECKING([whether to display the usecode container in Gumps])
  199. +if test x$enable_usecode_container = xyes; then
  200. +   AC_MSG_RESULT(yes)
  201. +   AC_DEFINE(SHOW_USECODE_CONTAINER, 1, [Display Usecode container])
  202. +else
  203. +   AC_MSG_RESULT(no)
  204. +fi
  205. +
  206. +# Show non-readied objects
  207. +AC_ARG_ENABLE(nonreadied-objects, AS_HELP_STRING([--enable-nonreadied-objects], [Enable display of non-readied objects for debugging purposes @<:@default no@:>@]),,enable_nonreadied_objects=no)
  208. +AC_MSG_CHECKING([whether to display non-readied objects in Gumps])
  209. +if test x$enable_nonreadied_objects = xyes; then
  210. +   AC_MSG_RESULT(yes)
  211. +   AC_DEFINE(SHOW_NONREADIED_OBJECTS, 1, [Display non-readied objects])
  212. +else
  213. +   AC_MSG_RESULT(no)
  214. +fi
  215. +
  216. +# gnome-shp-thumbnailer
  217. +AC_ARG_ENABLE(gnome-shp-thumbnailer, AS_HELP_STRING([--enable-gnome-shp-thumbnailer], [Build Gnome SHP Thumbnailer @<:@default no@:>@]),,enable_gnome_shp_thumbnailer=no)
  218. +AC_MSG_CHECKING([whether to build the Gnome SHP Thumbnailer])
  219. +if test x$enable_gnome_shp_thumbnailer = xyes; then
  220. +   AC_MSG_RESULT(yes)
  221. +   if test x$have_gdk_pixbuf = xno; then
  222. +       echo "Umm, but we don't have any Gdk-Pixbuf stuff."
  223. +       echo "Try again, either with Gdk-Pixbuf-2.0, or with --disable-gnome-shp-thumbnailer"
  224. +       exit 1
  225. +   fi
  226. +   AM_CONDITIONAL(BUILD_GTHUMB, true)
  227. +else
  228. +   AM_CONDITIONAL(BUILD_GTHUMB, false)
  229. +   AC_MSG_RESULT(no)
  230. +fi
  231. +
  232. +# GIMP plugin
  233. +AM_CONDITIONAL(GIMP_PLUGIN, false)
  234. +AC_ARG_ENABLE(gimp-plugin, AS_HELP_STRING([--enable-gimp-plugin], [Build the GIMP plugin @<:@default no@:>@]),,enable_gimp_plugin=no)
  235. +AC_MSG_CHECKING([whether to build the GIMP plugin])
  236. +if test x$enable_gimp_plugin = xyes; then
  237. +   AC_MSG_RESULT(yes)
  238. +   AC_MSG_CHECKING([for gimptool])
  239. +   AC_CHECK_PROGS(GIMPTOOL, gimptool-2.0)
  240. +   if test -z "$GIMPTOOL"; then
  241. +       AC_MSG_RESULT([no, not building GIMP plugin])
  242. +   else
  243. +       AC_MSG_CHECKING([for GIMP version])
  244. +       gimp_version=`$GIMPTOOL --version`
  245. +       AX_COMPARE_VERSION([$gimp_version], [ge], [2.8.0], [dnl
  246. +           dnl $gimp_version >= 2.8.0
  247. +           AC_MSG_RESULT([found $gimp_version >= 2.8.0])
  248. +           AC_SUBST(GIMPTOOL)
  249. +           AM_CONDITIONAL(GIMP_PLUGIN, true)
  250. +           GIMP_PLUGIN_PREFIX=`$GIMPTOOL --gimpplugindir`
  251. +           GIMP_PLUGIN_PREFIX="$GIMP_PLUGIN_PREFIX/plug-ins"
  252. +           AC_SUBST(GIMP_PLUGIN_PREFIX)
  253. +           AC_DEFINE(HAVE_GIMP, 1, [Have GIMP])
  254. +           GIMP_INCLUDES=`$PKG_CONFIG --cflags gimpui-2.0`
  255. +           GIMP_LIBS=`$PKG_CONFIG --libs gimpui-2.0`
  256. +           AC_SUBST(GIMP_INCLUDES)
  257. +           AC_SUBST(GIMP_LIBS)
  258. +       ], [
  259. +           dnl $gimp_version < 2.8.0
  260. +           AC_MSG_RESULT([found $gimp_version < 2.8.0 - disabling plugin])
  261. +       ])
  262. +   fi
  263. +else
  264. +   AC_MSG_RESULT(no)
  265. +fi
  266.  
  267.  # ---------------------------------------------------------------------
  268.  # Alternative directories
  269. @@ -934,7 +1121,6 @@ else
  270.     AC_MSG_RESULT(no)
  271.  fi
  272.  
  273. -
  274.  # ---------------------------------------------------------------------
  275.  # Warning level
  276.  # ---------------------------------------------------------------------
  277. @@ -984,193 +1170,6 @@ do
  278.     AX_CHECK_COMPILE_FLAG([$cxx_flag], [WARNINGS="$WARNINGS $cxx_flag"], [], [$DEBUG_LEVEL -Werror])
  279.  done
  280.  
  281. -
  282. -# --------------------
  283. -# External features
  284. -# --------------------
  285. -
  286. -# Build any external programs?
  287. -AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools], [Only build the main program]),,enable_tools=yes)
  288. -AC_MSG_CHECKING([whether to build only the main program])
  289. -if test x$enable_tools = xno; then
  290. -   AC_MSG_RESULT(yes)
  291. -   AM_CONDITIONAL(BUILD_TOOLS, false)
  292. -   enable_gimp_plugin=no
  293. -   enable_compiler=no
  294. -else
  295. -   AM_CONDITIONAL(BUILD_TOOLS, true)
  296. -   AC_MSG_RESULT(no)
  297. -fi
  298. -
  299. -# Build compiler?
  300. -AC_ARG_ENABLE(compiler, AS_HELP_STRING([--enable-compiler], [Build the usecode compiler @<:@default no@:>@]),,enable_compiler=no)
  301. -AC_MSG_CHECKING([whether to build the usecode compiler])
  302. -if test x$enable_compiler = xno; then
  303. -   AC_MSG_RESULT(no)
  304. -   AM_CONDITIONAL(BUILD_COMPILER, false)
  305. -else
  306. -   AC_MSG_RESULT(yes)
  307. -   AM_CONDITIONAL(BUILD_COMPILER, true)
  308. -fi
  309. -
  310. -# Build data files?
  311. -AC_ARG_ENABLE(data, AS_HELP_STRING([--enable-data], [Create the data files @<:@default yes@:>@]),,enable_data=yes)
  312. -AC_MSG_CHECKING([whether to build the data files])
  313. -if test x$enable_data = xno; then
  314. -   AC_MSG_RESULT(no)
  315. -   AM_CONDITIONAL(DATA_FILES, false)
  316. -else
  317. -   AM_CONDITIONAL(DATA_FILES, true)
  318. -   AC_MSG_RESULT(yes)
  319. -fi
  320. -
  321. -# Build mods?
  322. -AC_ARG_ENABLE(mods, AS_HELP_STRING([--enable-mods], [Build the Exult mods (requires usecode compiler) @<:@default no@:>@]),,enable_mods=no)
  323. -AC_MSG_CHECKING([whether to build the Exult mods])
  324. -if test x$enable_mods = xno -o x$enable_compiler = xno; then
  325. -   AC_MSG_RESULT(no)
  326. -   AM_CONDITIONAL(BUILD_MODS, false)
  327. -else
  328. -   AM_CONDITIONAL(BUILD_MODS, true)
  329. -   AC_MSG_RESULT(yes)
  330. -fi
  331. -
  332. -# Freetype2 (optional, used in ExultStudio, shapes/fontgen.cc)
  333. -AC_PATH_PROG(FT2CONFIG, freetype-config)
  334. -if test -n "$FT2CONFIG"; then
  335. -   FREETYPE2_LIBS=`$FT2CONFIG --libs`
  336. -   SAVED_LDFLAGS="$LDFLAGS"
  337. -   LDFLAGS="$LDFLAGS $FREETYPE2_LIBS"
  338. -   AC_CHECK_FUNC(FT_Init_FreeType, have_freetype=yes, have_freetype=no)
  339. -   LDFLAGS="$SAVED_LDFLAGS"
  340. -   FREETYPE2_INCLUDES=`$FT2CONFIG --cflags`
  341. -   if test x$have_freetype = xyes; then
  342. -       AC_DEFINE(HAVE_FREETYPE2, 1, [Have freetype2])
  343. -   else
  344. -       FREETYPE2_LIBS=
  345. -       FREETYPE2_INCLUDES=
  346. -   fi
  347. -   AC_SUBST(FREETYPE2_LIBS)
  348. -   AC_SUBST(FREETYPE2_INCLUDES)
  349. -fi
  350. -
  351. -# exult-studio
  352. -AC_ARG_ENABLE(exult-studio, AS_HELP_STRING([--enable-exult-studio], [Build Exult Studio @<:@default no@:>@]),,enable_exult_studio=no)
  353. -AC_MSG_CHECKING([whether to build Exult Studio])
  354. -if test x$enable_exult_studio = xyes; then
  355. -   AC_MSG_RESULT(yes)
  356. -   if test x$have_gtk = xno; then
  357. -       echo "Exult Studio requires the GTK+ (aka the GIMP Tool Kit), but it is not installed."
  358. -       echo "Please try again, either with the GTK+ installed as 3.16 or newer, or with '--disable-exult-studio'."
  359. -       exit 1
  360. -   fi
  361. -   if test x$have_icu = xno; then
  362. -       echo "Exult Studio requires the ICU (aka the International Components for Unicode), but it is not installed."
  363. -       echo "Please try again, either with the ICU installed, or with '--disable-exult-studio'."
  364. -       exit 1
  365. -   fi
  366. -   AM_CONDITIONAL(BUILD_STUDIO, true)
  367. -   AM_CONDITIONAL(BUILD_SHAPES, true)
  368. -else
  369. -   AM_CONDITIONAL(BUILD_STUDIO, false)
  370. -   AC_MSG_RESULT(no)
  371. -fi
  372. -
  373. -# Usecode debugger
  374. -AC_ARG_WITH([usecode-debugger],
  375. -            AS_HELP_STRING([--with-usecode-debugger=no|console|yes],
  376. -                           [Experimental and buggy support for usecode debugging @<:@default no@:>@]),
  377. -            [enable_usecode_debugger="$withval"], [enable_usecode_debugger="no"])
  378. -AC_MSG_CHECKING([whether to enable the usecode debugger])
  379. -if test x$enable_usecode_debugger = xconsole -o x$enable_usecode_debugger = xyes; then
  380. -   AC_MSG_RESULT(yes)
  381. -   if test x$enable_usecode_debugger = xconsole; then
  382. -       AC_DEFINE(USECODE_CONSOLE_DEBUGGER, 1, [Enable Usecode debugging on console])
  383. -   elif test x$enable_exult_studio != xyes; then
  384. -       echo "But we are not building Exult Studio."
  385. -       echo "Try again, either with --enable-exult-studio, or without the usecode debugger"
  386. -       exit 1
  387. -   elif test x$enable_exult_studio_support != xyes; then
  388. -       echo "But we are not building Exult with Exult Studio support."
  389. -       echo "Try again, either with --enable-exult-studio-support, or without the usecode debugger"
  390. -       exit 1
  391. -   fi
  392. -   AC_DEFINE(USECODE_DEBUGGER, 1, [Enable Usecode debugging])
  393. -else
  394. -   AC_MSG_RESULT(no)
  395. -fi
  396. -
  397. -# Usecode container
  398. -AC_ARG_ENABLE(usecode-container, AS_HELP_STRING([--enable-usecode-container], [Enable display of usecode container for debugging purposes @<:@default no@:>@]),,enable_usecode_container=no)
  399. -AC_MSG_CHECKING([whether to display the usecode container in Gumps])
  400. -if test x$enable_usecode_container = xyes; then
  401. -   AC_MSG_RESULT(yes)
  402. -   AC_DEFINE(SHOW_USECODE_CONTAINER, 1, [Display Usecode container])
  403. -else
  404. -   AC_MSG_RESULT(no)
  405. -fi
  406. -
  407. -# Show non-readied objects
  408. -AC_ARG_ENABLE(nonreadied-objects, AS_HELP_STRING([--enable-nonreadied-objects], [Enable display of non-readied objects for debugging purposes @<:@default no@:>@]),,enable_nonreadied_objects=no)
  409. -AC_MSG_CHECKING([whether to display non-readied objects in Gumps])
  410. -if test x$enable_nonreadied_objects = xyes; then
  411. -   AC_MSG_RESULT(yes)
  412. -   AC_DEFINE(SHOW_NONREADIED_OBJECTS, 1, [Display non-readied objects])
  413. -else
  414. -   AC_MSG_RESULT(no)
  415. -fi
  416. -
  417. -# gnome-shp-thumbnailer
  418. -AC_ARG_ENABLE(gnome-shp-thumbnailer, AS_HELP_STRING([--enable-gnome-shp-thumbnailer], [Build Gnome SHP Thumbnailer @<:@default no@:>@]),,enable_gnome_shp_thumbnailer=no)
  419. -AC_MSG_CHECKING([whether to build the Gnome SHP Thumbnailer])
  420. -if test x$enable_gnome_shp_thumbnailer = xyes; then
  421. -   AC_MSG_RESULT(yes)
  422. -   if test x$have_gdk_pixbuf = xno; then
  423. -       echo "Umm, but we don't have any Gdk-Pixbuf stuff."
  424. -       echo "Try again, either with Gdk-Pixbuf-2.0, or with --disable-gnome-shp-thumbnailer"
  425. -       exit 1
  426. -   fi
  427. -   AM_CONDITIONAL(BUILD_GTHUMB, true)
  428. -else
  429. -   AM_CONDITIONAL(BUILD_GTHUMB, false)
  430. -   AC_MSG_RESULT(no)
  431. -fi
  432. -
  433. -# GIMP plugin
  434. -AM_CONDITIONAL(GIMP_PLUGIN, false)
  435. -AC_ARG_ENABLE(gimp-plugin, AS_HELP_STRING([--enable-gimp-plugin], [Build the GIMP plugin @<:@default no@:>@]),,enable_gimp_plugin=no)
  436. -AC_MSG_CHECKING([whether to build the GIMP plugin])
  437. -if test x$enable_gimp_plugin = xyes; then
  438. -   AC_MSG_RESULT(yes)
  439. -   AC_MSG_CHECKING([for gimptool])
  440. -   AC_CHECK_PROGS(GIMPTOOL, gimptool-2.0)
  441. -   if test -z "$GIMPTOOL"; then
  442. -       AC_MSG_RESULT([no, not building GIMP plugin])
  443. -   else
  444. -       AC_MSG_CHECKING([for GIMP version])
  445. -       gimp_version=`$GIMPTOOL --version`
  446. -       AX_COMPARE_VERSION([$gimp_version], [ge], [2.8.0], [dnl
  447. -           dnl $gimp_version >= 2.8.0
  448. -           AC_MSG_RESULT([found $gimp_version >= 2.8.0])
  449. -           AC_SUBST(GIMPTOOL)
  450. -           AM_CONDITIONAL(GIMP_PLUGIN, true)
  451. -           GIMP_PLUGIN_PREFIX=`$GIMPTOOL --gimpplugindir`
  452. -           GIMP_PLUGIN_PREFIX="$GIMP_PLUGIN_PREFIX/plug-ins"
  453. -           AC_SUBST(GIMP_PLUGIN_PREFIX)
  454. -           AC_DEFINE(HAVE_GIMP, 1, [Have GIMP])
  455. -           GIMP_INCLUDES=`$PKG_CONFIG --cflags gimpui-2.0`
  456. -           GIMP_LIBS=`$PKG_CONFIG --libs gimpui-2.0`
  457. -           AC_SUBST(GIMP_INCLUDES)
  458. -           AC_SUBST(GIMP_LIBS)
  459. -       ], [
  460. -           dnl $gimp_version < 2.8.0
  461. -           AC_MSG_RESULT([found $gimp_version < 2.8.0 - disabling plugin])
  462. -       ])
  463. -   fi
  464. -else
  465. -   AC_MSG_RESULT(no)
  466. -fi
  467. -
  468.  # ----------------------------------------------------------------
  469.  # If we are cross-compiling, look for expack and head2data in PATH
  470.  # ----------------------------------------------------------------
  471. @@ -1324,14 +1323,14 @@ if test x$enable_android_apk = xno; then
  472.         PKG_CHECK_EXISTS(zlib,
  473.             echo zlib....................... : `$PKG_CONFIG --modversion zlib`)
  474.     fi
  475. -   if test x$have_icu = xyes; then
  476. +   if test x$enable_exult_studio = xyes; then
  477.         echo ICU........................ : `$PKG_CONFIG --modversion icu-uc`
  478.     fi
  479. -   if test x$have_gtk = xyes; then
  480. +   if test x$enable_exult_studio = xyes; then
  481.         echo GLIB....................... : `$PKG_CONFIG --modversion glib-2.0`
  482.         echo GTK+....................... : `$PKG_CONFIG --modversion gtk+-3.0`
  483.     fi
  484. -   if test x$have_gdk_pixbuf = xyes; then
  485. +   if test x$have_gdk_pixbuf = xyes -a x$enable_gimp_plugin = xyes; then
  486.         echo GDK-Pixbuf................. : `$PKG_CONFIG --modversion gdk-pixbuf-2.0`
  487.     fi
  488.     echo
  489.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!