Changeset 10192 for trunk/FACT++


Ignore:
Timestamp:
03/02/11 09:34:14 (14 years ago)
Author:
tbretz
Message:
Cleanup, added new MYSQL m4-macros
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/configure.ac

    r10189 r10192  
    88AC_CONFIG_AUX_DIR([.aux_dir])
    99AC_PROG_CC([colorgcc gcc])
     10 #If output variable CXXFLAGS was not already set, set it to -g -O2
    1011AC_PROG_CXX([colorgcc g++])
    1112LT_INIT([disable-static])
    … …  
    2021AM_PROG_CC_C_O
    2122
    22 
    23 DX_INIT_DOXYGEN([FACT++])#, DOXYFILE-PATH, [OUTPUT-DIR])
    24 #DX_DOXYGEN_FEATURE(ON)
    25 #DX_DOT_FEATURE(ON)
    26 #DX_HTML_FEATURE(ON)
    27 #DX_CHM_FEATURE(ON|OFF)
    28 #DX_CHI_FEATURE(ON|OFF)
    29 DX_MAN_FEATURE(ON)
    30 #DX_RTF_FEATURE(ON|OFF)
    31 #DX_XML_FEATURE(ON|OFF)
    32 #DX_PDF_FEATURE(ON|OFF)
    33 DX_PS_FEATURE(OFF)
     23######################################################################
     24# DOXYGEN SUPPORT
     25######################################################################
     26
     27### FIXME: Need a configure commandline switch
    3428DX_ENV_APPEND(EXTRACT_ALL, YES)
    3529DX_ENV_APPEND(RECURSIVE,   YES)
    3630DX_ENV_APPEND(ALL_GRAPHS,  NO)  # change to yet to switch on call(er) graphs
    3731
     32#DX_DOXYGEN_FEATURE(ON)
     33#DX_DOT_FEATURE(ON)               # sets HAVE_DOT
     34#DX_HTML_FEATURE(ON)              # sets GENERATE_HTML (default)
     35#DX_CHM_FEATURE(ON|OFF)           # sets GENERATE_HTMLHELP
     36#DX_CHI_FEATURE(ON|OFF)           # sets GENERATE_CHI
     37#DX_MAN_FEATURE(ON)               # sets GENERATE_MAN (segfaults)
     38#DX_RTF_FEATURE(ON|OFF)           # sets GENERATE_RTF
     39#DX_XML_FEATURE(ON|OFF)           # sets GENERATE_XML
     40#DX_PDF_FEATURE(ON|OFF)           # sets GENERATE_PDF (default)
     41DX_PS_FEATURE(OFF)                # sets GENERATE_PS  (default)
     42DX_INIT_DOXYGEN($PACKAGE_NAME)#, DOXYFILE-PATH, [OUTPUT-DIR])
     43
    3844#USE_HTAGS              = $(USE_HTAGS)
     45
     46######################################################################
     47# Readline/NCurses
     48######################################################################
     49
     50AC_LANG_PUSH(C)
     51
     52AC_CHECK_LIB(readline, readline, [],
     53   [
     54      echo "Error! libreadline not found in default libarary paths."
     55      exit -1
     56   ]
     57)
     58AC_CHECK_HEADERS(readline/readline.h, [],
     59   [
     60      echo "Error! readline/readline.h not properly installed in default include path (maybe readline-dev missing)."
     61      exit -1
     62   ]
     63)
     64
     65
     66AC_CHECK_HEADERS(panel.h, [],
     67   [
     68      echo "Error! Ncurses panel.h not properly installed in default include paths."
     69      exit -1
     70   ]
     71)
     72AC_CHECK_LIB(panel, update_panels, [],
     73   [
     74      echo "Error! Ncurses libpanel not properly installed in the default libarary paths."
     75      exit -1
     76   ]
     77)
     78
     79AC_LANG_POP
     80
     81######################################################################
     82# pthread support
     83######################################################################
     84
     85#AX_PTHREAD
     86#
     87#AC_CHECK_LIB(pthread,  pthread_create,
     88#   [],
     89#   [
     90#      echo "Error! libpthread not found in default libarary paths."
     91#      exit -1
     92#   ]
     93#)
     94#AC_CHECK_HEADERS(pthread.h, [],
     95#   [
     96#      echo "Error! pthread.h not properly installed in default include paths."
     97#      exit -1
     98#   ]
     99#)
     100
     101######################################################################
     102# Xm.h (lesstif/motif)
     103######################################################################
     104
     105AC_LANG_PUSH(C)
     106
     107AC_CHECK_HEADERS([Mrm/MrmAppl.h Xm/Xm.h], [],
     108   [
     109      echo "Error! Mrm/MrmAppl.h, Xm/Xm.h not properly installed, needed to compile did (you need most probably lesstif2-dev)."
     110      exit -1
     111   ]
     112)
     113
     114AC_CHECK_LIB(Xm, XtToolkitInitialize, [],
     115   [
     116      echo "Error! libXm (lesstif2) not properly installed in the default library path (needed by dim to link did)."
     117      exit -1
     118   ]
     119)
     120
     121AC_LANG_POP
     122
     123######################################################################
     124# MySQL(++) SUPPORT
     125######################################################################
     126
     127MYSQL_DEVEL
     128MYSQLPP_DEVEL
     129
     130######################################################################
     131# BOOST SUPPORT
     132######################################################################
    39133
    40134AX_BOOST_BASE([1.42], [],
    … …  
    60154#ax_boost_wave
    61155#ax_boost_wserialization
    62 
    63 
    64 AC_LANG_PUSH(C)
    65 
    66 AC_CHECK_LIB(pthread,  pthread_create,
    67    [],
    68    [
    69       echo "Error! libpthread not found in default libarary paths."
    70       exit -1
    71    ]
    72 )
    73 AC_CHECK_HEADERS(pthread.h, [],
    74    [
    75       echo "Error! pthread.h not properly installed in default include paths."
    76       exit -1
    77    ]
    78 )
    79 
    80 
    81 AC_CHECK_LIB(readline, readline, [],
    82    [
    83       echo "Error! libreadline not found in default libarary paths."
    84       exit -1
    85    ]
    86 )
    87 AC_CHECK_HEADERS(readline/readline.h, [],
    88    [
    89       echo "Error! readline/readline.h not properly installed in default include path (maybe readline-dev missing)."
    90       exit -1
    91    ]
    92 )
    93 
    94 
    95 AC_CHECK_HEADERS(panel.h, [],
    96    [
    97       echo "Error! Ncurses panel.h not properly installed in default include paths."
    98       exit -1
    99    ]
    100 )
    101 AC_CHECK_LIB(panel, update_panels, [],
    102    [
    103       echo "Error! Ncurses libpanel not properly installed in the default libarary paths."
    104       exit -1
    105    ]
    106 )
    107 
    108 
    109 AC_CHECK_HEADERS([Mrm/MrmAppl.h Xm/Xm.h], [],
    110    [
    111       echo "Error! Mrm/MrmAppl.h, Xm/Xm.h not properly installed, needed to compile did (you need most probably lesstif2-dev)."
    112       exit -1
    113    ]
    114 )
    115 
    116 AC_CHECK_LIB(Xm, XtToolkitInitialize, [],
    117    [
    118       echo "Error! libXm (lesstif2) not properly installed in the default library path (needed by dim to link did)."
    119       exit -1
    120    ]
    121 )
    122 
    123 AC_LANG_POP()
    124156
    125157#AC_CHECK_HEADERS(
    … …  
    144176#)
    145177
    146 #AC_ARG_WITH([dim],
    147 #   [
    148 #      AS_HELP_STRING([--with-dim],
    149 #         [location of the Dim headers, defaults to dim_v19r15])
    150 #   ],
    151 #   [DIM_PATH="$withval"],
    152 #   [DIM_PATH="dim_v19r15"]
    153 #)
    154 #
    155 #AC_SUBST([DIM_PATH])
    156 #
    157 #CFLAGS="$CFLAGS -I$DIM_PATH/dim"
    158 #CPPFLAGS="$CPPFLAGS -I$DIM_PATH/dim"
    159 #INCLUDEPATH="$INCLUDEPATH -I$DIM_PATH/dim"
    160 #AC_CHECK_HEADERS([dis.hxx dic.hxx], [],
    161 #  [
    162 #      echo "Error! Dim headers (dis.hxx, dic.hxx) not found in $DIM_PATH/dim."
    163 #      exit -1
    164 #   ]
    165 #)
    166 
    167 ## ============>   boost header and boost libraries
    168 
    169 ##########################################################################
    170 #AC_ARG_WITH([dim-include-path],
    171 #   [
    172 #      AS_HELP_STRING([--with-dim-include-path],
    173 #         [location of the Dim headers, defaults to ${HOME}/FACT/dim_v19r11/dim])
    174 #   ],
    175 #   [DIM_INCLUDE_PATH="$withval"],
    176 #   [DIM_INCLUDE_PATH="${HOME}/Software/Dim/dim_v19r11/dim"]
    177 #)
    178 #DIM_CFLAGS="-I$DIM_INCLUDE_PATH"
    179 ##AC_SUBST([DIM_CFLAGS])
    180 #
    181 #CFLAGS="$CFLAGS $DIM_CFLAGS"
    182 #CPPFLAGS="$CPPFLAGS $DIM_CFLAGS"
    183 ##INCLUDEPATH="$INCLUDEPATH $DIM_INCLUDE_PATH"
    184 #AC_CHECK_HEADERS([dis.hxx dic.hxx], [],
    185 #   [
    186 #      echo "Error! Dim headers (dis.hxx, dic.hxx) not found in $DIM_INCLUDE_PATH."
    187 #      exit -1
    188 #   ]
    189 #)
    190 ##########################################################################
    191 
     178######################################################################
     179# ROOT SUPPORT
     180######################################################################
     181
     182# ROOT_PATH([5.12/00, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]])
     183# ROOT_PATH([5.12/00])
     184# ROOT_PATH(3.03/05, , AC_MSG_ERROR(Your ROOT version is too old))
     185# ROOT_PATH(, AC_DEFINE([HAVE_ROOT]))
     186
     187# ROOTCONF           full path to root-config
     188# ROOTEXEC           full path to root
     189# ROOTCINT           full path to rootcint
     190# ROOTLIBDIR         Where the ROOT libraries are
     191# ROOTINCDIR         Where the ROOT headers are
     192# ROOTETCDIR         Where the ROOT configuration is
     193# ROOTCFLAGS         Extra compiler flags
     194# ROOTLIBS           ROOT basic libraries
     195# ROOTGLIBS          ROOT basic + GUI libraries
     196# ROOTAUXLIBS        Auxilary libraries and linker flags for ROOT
     197# ROOTAUXCFLAGS      Auxilary compiler flags
     198# ROOTRPATH          Same as ROOTLIBDIR
    192199
    193200
    194201###########################################################################
    195 #AC_ARG_WITH([dim-lib-path],
    196 #  [
    197 #     AS_HELP_STRING([--with-dim-lib-path],
    198 #        [location of the Dim libraries, defaults to ${HOME}/FACT/dim_v19r11/linux])
    199 #  ],
    200 #  [DIM_LIB_PATH="$withval"],
    201 #  [DIM_LIB_PATH="${HOME}/Software/Dim/dim_v19r11/linux"]
    202 #)
    203 #DIM_LIBS="-L$DIM_LIB_PATH -ldim"
    204 ##AC_SUBST([DIM_LIBS])
    205 #
    206 #LDFLAGS="$LDFLAGS $DIM_LIBS"
    207 #AC_CHECK_LIB(dim, [get_dns_port_number], [],
    208 #   [
    209 #      echo "Error! libdim.so file not found in $DIM_LIB_PATH."
    210 #      exit -1
    211 #   ]
    212 #)
    213 ###########################################################################
    214 
    215 
    216 
    217 # Get MySQL++ library and include locations
    218 #AC_ARG_WITH([mysqlpp-include-path],
    219 #   [
    220 #      AS_HELP_STRING([--with-mysqlpp-include-path],
    221 #         [location of the MySQL++ librarary headers, defaults to /usr/include/mysql++])
    222 #   ],
    223 #   [MYSQLPP_INCLUDE_PATH="$withval"],
    224 #   [MYSQLPP_INCLUDE_PATH=""]
    225 ##)
    226 #MYSQLPP_CFLAGS="-I$MYSQLPP_INCLUDE_PATH"
    227 ##AC_SUBST([DIM_CFLAGS])
    228 #
    229 #CFLAGS="$CFLAGS $MYSQLPP_CFLAGS"
    230 #CPPFLAGS="$CPPFLAGS $MYSQLPP_CFLAGS"
    231 ##INCLUDEPATH="$INCLUDEPATH $DIM_INCLUDE_PATH"
    232 #AC_CHECK_HEADERS([mysql++/mysql++.h],
    233 #   [],
    234 #   [
    235 #      echo "Error! mysql++/mysql++.h not found in default include path."
    236 #      exit -1
    237 #   ]
    238 #)
    239 #### LAST ARGUMENT IS "OTHER LIBRARIES"
    240 
    241 
    242 
    243 #AC_ARG_WITH([mysql-lib-path],
    244 #  [
    245 #     AS_HELP_STRING([--with-mysql-lib-path],
    246 #        [location of the MySQL library, defaults to /usr/lib])
    247 #  ],
    248 #  [MYSQL_LIB_PATH="$withval"],
    249 #  [MYSQL_LIB_PATH="/usr/lib"]
    250 #)
    251 #MYSQL_LIBS="-L$MYSQL_LIB_PATH -lmysql"
    252 ##AC_SUBST([DIM_LIBS])
    253 #
    254 #LDFLAGS="$LDFLAGS $MYSQL_LIBS"
    255 #AC_CHECK_LIB(mysql, [mysql_errno],
    256 #   [],
    257 #   [
    258 #      echo "Error! mysql libarary file not found in $MYSQL_LIB_PATH."
    259 #      exit -1
    260 #   ]
    261 #)
    262 
    263 
    264 
    265 
    266 AC_ARG_WITH([mysqlpp-lib-path],
    267   [
    268      AS_HELP_STRING([--with-mysqlpp-lib-path],
    269         [location of the MySQL++ library, defaults to /usr/lib])
    270   ],
    271   [MYSQLPP_LIB_PATH="$withval"],
    272   [MYSQLPP_LIB_PATH="/usr/lib"]
    273 )
    274 MYSQLPP_LIBS="-L$MYSQLPP_LIB_PATH -lmysqlpp"
    275 #AC_SUBST([DIM_LIBS])
    276 
    277 #LDFLAGS="$LDFLAGS $MYSQLPP_LIBS"
    278 #AC_CHECK_LIB(mysql++, [mysql_errno],
    279 #   [],
    280 #   [
    281 #      echo "Error! mysql++ libarary file not found in $MYSQL_LIB_PATH."
    282 #      exit -1
    283 #   ]
    284 #)
    285 
    286 
    287 
    288 
    289 
    290 #CPPFLAGS="$CPPFLAGS -std=c++0x"
    291 
    292 CPPFLAGS="$CPPFLAGS -I/usr/include/mysql"
    293 
    294 
    295 
    296 
    297 #AC_CHECK_HEADERS_ONCE(dim.h)
     202
    298203
    299204#AC_C_CONST
    … …  
    301206#AC_HEADER_STDC
    302207
     208##########################################################################
     209# debug compilation support
     210##########################################################################
     211#
     212#AC_MSG_CHECKING([whether to build with debug information])
     213#AC_ARG_ENABLE([debug],
     214#    [AS_HELP_STRING([--enable-debug],
     215#        [enable debug data generation (def=no)])],
     216#    [debugit="$enableval"],
     217#    [debugit=no])
     218#AC_MSG_RESULT([$debugit])
     219#
     220#if test x"$debugit" = x"yes"; then
     221#    AC_DEFINE([DEBUG],[],[Debug Mode])
     222#    AM_CXXFLAGS="$AM_CXXFLAGS -g -Wall -Werror -Wno-uninitialized -O0"
     223#else
     224#    AC_DEFINE([NDEBUG],[],[No-debug Mode])
     225#    AM_CXXFLAGS="$AM_CXXFLAGS -O3"
     226#fi
     227#
     228###########################################################################
     229#To get the changed compiler flags distributed among your final Makefiles you have to add the following line somewhere afterwards:
     230#
     231#AC_SUBST([AM_CXXFLAGS])
     232
     233
     234
    303235AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.